From 4c37bc0363ed7dad3afb7e7920ee558d135a12ec Mon Sep 17 00:00:00 2001
From: shanshuirenjia <978987373@qq.com>
Date: Tue, 23 Apr 2019 10:49:07 +0800
Subject: [PATCH] repair grid-item locked bug

---
 frontend/src/components/dirent-grid-view/dirent-grid-item.js | 5 ++++-
 frontend/src/components/dirent-grid-view/dirent-grid-view.js | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-item.js b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
index 596a80c661..8de5de9fa4 100644
--- a/frontend/src/components/dirent-grid-view/dirent-grid-item.js
+++ b/frontend/src/components/dirent-grid-view/dirent-grid-item.js
@@ -144,6 +144,9 @@ class DirentGridItem extends React.Component {
     gridClass += this.state.isGridSelected ? " grid-selected-active" : " ";
     gridClass += this.state.isGridDropTipShow ? " grid-drop-show" : " ";
 
+    let lockedInfo = gettext('locked by {name}');
+    lockedInfo = lockedInfo.replace('{name}', dirent.lock_owner_name);
+
     return(
       <Fragment>
         <li className="grid-item" onContextMenu={this.onGridItemContextMenu} onMouseDown={this.onGridItemMouseDown}>
@@ -161,7 +164,7 @@ class DirentGridItem extends React.Component {
               <img src={`${siteRoot}${fileUrl}`} ref={this.gridIcon} className="thumbnail" onClick={this.onItemClick} alt=""/> :
               <img src={iconUrl} ref={this.gridIcon} width="96" alt='' />
             }
-            {dirent.is_locked && <img className="grid-file-locked-icon" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} title={dirent.lock_owner_name}/>}
+            {dirent.is_locked && <img className="grid-file-locked-icon" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} title={lockedInfo}/>}
           </div>
           <div className="grid-file-name" onDragStart={this.onGridItemDragStart} draggable="true" >
             <a className={`grid-file-name-link ${this.state.isGridSelected ? "grid-link-selected-active" : ""}`} href={dirent.type === 'dir' ? dirHref : fileHref} onClick={this.onItemLinkClick}>{dirent.name}</a>
diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-view.js b/frontend/src/components/dirent-grid-view/dirent-grid-view.js
index 770a78351e..71bf93aa67 100644
--- a/frontend/src/components/dirent-grid-view/dirent-grid-view.js
+++ b/frontend/src/components/dirent-grid-view/dirent-grid-view.js
@@ -225,6 +225,8 @@ class DirentGridView extends React.Component{
     seafileAPI.lockfile(repoID, filePath).then(() => {
       this.props.updateDirent(currentObject, 'is_locked', true);
       this.props.updateDirent(currentObject, 'locked_by_me', true);
+      let lockName = username.split('@');
+      this.props.updateDirent(currentObject, 'lock_owner_name', lockName[0]);
     });
   }
 
@@ -234,6 +236,7 @@ class DirentGridView extends React.Component{
     seafileAPI.unlockfile(repoID, filePath).then(() => {
       this.props.updateDirent(currentObject, 'is_locked', false);
       this.props.updateDirent(currentObject, 'locked_by_me', false);
+      this.props.updateDirent(currentObject, 'lock_owner_name', '');
     });
   }