From c61e6354d9a279c1deae49bc5be8ad0b6450ac73 Mon Sep 17 00:00:00 2001
From: Michael An <2331806369@qq.com>
Date: Wed, 20 Mar 2019 15:53:31 +0800
Subject: [PATCH] isPro lock file (#3149)

* isPro lock file

* scroll to bottom
---
 .../dirent-list-view/dirents-menu.js          | 21 +++++++++++--------
 .../review-list-view/review-comments.js       |  5 ++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/dirent-list-view/dirents-menu.js b/frontend/src/components/dirent-list-view/dirents-menu.js
index 23be4b9592..7d4366d57a 100644
--- a/frontend/src/components/dirent-list-view/dirents-menu.js
+++ b/frontend/src/components/dirent-list-view/dirents-menu.js
@@ -26,16 +26,19 @@ class DirentMenu extends React.Component {
     const length = dirents.length;
     let menuList = [];
     if (length === 1) {
-      if (dirents[0].type === 'dir') {
+      const dirent = dirents[0];
+      if (dirent.type === 'dir') {
         menuList = ['Share'];
-      } else if (dirents[0].type === 'file') {
-        if (dirents[0].is_locked) {
-          menuList = ['Share', 'Unlock', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
-        } else {
-          menuList = ['Share', 'Lock', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
-        }
-        if (!(currentRepoInfo.is_admin && currentRepoInfo.permission === 'rw' || isRepoOwner)) {
-          menuList.splice(1, 1);
+      } else if (dirent.type === 'file') {
+        menuList = ['Share', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
+        if (isPro) {
+          if (dirent.is_locked) {
+            if (dirent.locked_by_me || (dirent.lock_owner === 'OnlineOffice' && currentRepoInfo.permission === 'rw')) {
+              menuList.splice(1, 0, 'Unlock');
+            }
+          } else {
+            menuList.splice(1, 0, 'Lock');
+          }
         }
       }
     } else {
diff --git a/frontend/src/components/review-list-view/review-comments.js b/frontend/src/components/review-list-view/review-comments.js
index 9a745d8864..2d53f7a45d 100644
--- a/frontend/src/components/review-list-view/review-comments.js
+++ b/frontend/src/components/review-list-view/review-comments.js
@@ -41,7 +41,10 @@ class ReviewComments extends React.Component {
         commentsList: commentList
       });
       if (scroll) {
-        this.refs.commentsList.scrollTo(0, 10000);
+        let that = this;
+        setTimeout(() => {
+          that.refs.commentsList.scrollTo(0, 10000);
+        }, 100);
       }
     });
   }