From 1dbd94e9ed2f96df832cb3fc84d53870240a8cea Mon Sep 17 00:00:00 2001
From: Leo <is.li.xiaoyu@qq.com>
Date: Sat, 12 Oct 2019 10:06:41 +0800
Subject: [PATCH 1/9] fix virtual repo url in email notices (#4142)

---
 seahub/notifications/management/commands/send_notices.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seahub/notifications/management/commands/send_notices.py b/seahub/notifications/management/commands/send_notices.py
index 577ad82713..ae9155dfbc 100644
--- a/seahub/notifications/management/commands/send_notices.py
+++ b/seahub/notifications/management/commands/send_notices.py
@@ -98,7 +98,7 @@ class Command(BaseCommand):
                 owner = seafile_api.get_repo_owner(repo_id)
                 repo = seafile_api.get_virtual_repo(repo_id, path, owner)
 
-        repo_url = reverse('lib_view', args=[repo_id, repo.name, ''])
+        repo_url = reverse('lib_view', args=[repo.id, repo.name, ''])
         notice.repo_url = repo_url
         notice.notice_from = escape(email2nickname(d['share_from']))
         notice.repo_name = repo.name
@@ -129,7 +129,7 @@ class Command(BaseCommand):
                 owner = seafile_api.get_repo_owner(repo_id)
                 repo = seafile_api.get_virtual_repo(repo_id, path, owner)
 
-        repo_url = reverse('lib_view', args=[repo_id, repo.name, ''])
+        repo_url = reverse('lib_view', args=[repo.id, repo.name, ''])
         notice.repo_url = repo_url
         notice.notice_from = escape(email2nickname(d['share_from']))
         notice.repo_name = repo.name

From 821d6afbaae8ca74c3070bb6263132d71dbc1fcc Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Sat, 12 Oct 2019 10:27:41 +0800
Subject: [PATCH 2/9] use fake relay_id (#4101)

relay_id is used when desktop client syncing repo, but is removed after 7.0.0.
In order to be compatible with the old client, a default value is required.
Length must be 40
---
 seahub/api2/views.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index df1d0cc80b..2e4901a22d 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -129,7 +129,7 @@ except ImportError:
 from pysearpc import SearpcError, SearpcObjEncoder
 import seaserv
 from seaserv import seafserv_threaded_rpc, \
-    get_personal_groups_by_user, get_session_info, is_personal_repo, \
+    get_personal_groups_by_user, is_personal_repo, \
     get_repo, check_permission, get_commits, is_passwd_set,\
     check_quota, list_share_repos, get_group_repos_by_owner, get_group_repoids, \
     remove_share, get_group, \
@@ -608,7 +608,6 @@ def repo_download_info(request, repo_id, gen_sync_token=True):
         return api_error(status.HTTP_404_NOT_FOUND, 'Library not found.')
 
     # generate download url for client
-    relay_id = get_session_info().id
     addr, port = get_ccnet_server_addr_port()
     email = request.user.username
     if gen_sync_token:
@@ -628,7 +627,7 @@ def repo_download_info(request, repo_id, gen_sync_token=True):
     calculate_repos_last_modify([repo])
 
     info_json = {
-        'relay_id': relay_id,
+        'relay_id': '44e8f253849ad910dc142247227c8ece8ec0f971',
         'relay_addr': addr,
         'relay_port': port,
         'email': email,

From 5b789c43002778c457732e94fe64abce2357de80 Mon Sep 17 00:00:00 2001
From: Leo <is.li.xiaoyu@qq.com>
Date: Sat, 12 Oct 2019 14:54:25 +0800
Subject: [PATCH 3/9] corrent logic for check generate share link, and share
 link permissions (#4121)

---
 .../components/dialog/generate-share-link.js  | 44 +++++++-----
 .../src/components/dialog/share-dialog.js     |  3 +
 .../dirent-list-view/dirent-list-item.js      | 22 +++---
 .../components/select-editor/select-editor.js |  4 ++
 frontend/src/pages/share-admin/share-links.js | 72 ++++++++++---------
 frontend/src/utils/utils.js                   | 45 ++++++++++++
 seahub/api2/endpoints/dir.py                  |  4 +-
 seahub/api2/endpoints/share_links.py          |  6 +-
 seahub/utils/repo.py                          |  5 ++
 9 files changed, 140 insertions(+), 65 deletions(-)

diff --git a/frontend/src/components/dialog/generate-share-link.js b/frontend/src/components/dialog/generate-share-link.js
index 741d75630b..7a8fd747fc 100644
--- a/frontend/src/components/dialog/generate-share-link.js
+++ b/frontend/src/components/dialog/generate-share-link.js
@@ -25,11 +25,6 @@ class GenerateShareLink extends React.Component {
     this.isExpireDaysNoLimit = (parseInt(shareLinkExpireDaysMin) === 0 && parseInt(shareLinkExpireDaysMax) === 0 && shareLinkExpireDaysDefault == 0);
     this.defaultExpireDays = this.isExpireDaysNoLimit ? '' : shareLinkExpireDaysDefault;
 
-    if (isPro) {
-      this.editOption = 'edit_download';
-      this.permissionOptions = ['preview_download', 'preview_only'];
-    }   
-
     this.state = {
       isValidate: false,
       isShowPasswordInput: false,
@@ -42,7 +37,8 @@ class GenerateShareLink extends React.Component {
       sharedLinkInfo: null,
       isNoticeMessageShow: false,
       isLoading: true,
-      currentPermission: isPro ? this.permissionOptions[0] : '',
+      permissionOptions: [],
+      currentPermission: '',
       isSendLinkShown: false
     };
   }
@@ -65,15 +61,32 @@ class GenerateShareLink extends React.Component {
       toaster.danger(errMessage);
     });
 
-    if (isPro && Utils.isEditableOfficeFile(path)) {
-      seafileAPI.getFileInfo(repoID, path).then((res) => {
-        if (res.data.can_edit) {
-          this.permissionOptions.push(this.editOption);
+    if (isPro) {
+      if (this.props.itemType === 'library') {
+        let permissionOptions = Utils.getShareLinkPermissionList(this.props.itemType, '', path);
+        this.setState({
+          permissionOptions: permissionOptions,
+          currentPermission: permissionOptions[0],
+        });
+      } else {
+        let getDirentInfoAPI;
+        if (this.props.itemType === 'file') {
+          getDirentInfoAPI = seafileAPI.getFileInfo(repoID, path);
+        } else if (this.props.itemType === 'dir') {
+          getDirentInfoAPI = seafileAPI.getDirInfo(repoID, path);
         }
-      }).catch(error => {
-        let errMessage = Utils.getErrorMsg(error);
-        toaster.danger(errMessage);
-      });
+        getDirentInfoAPI.then((res) => {
+          let permission = res.data.permission;
+          let permissionOptions = Utils.getShareLinkPermissionList(this.props.itemType, permission, path);
+          this.setState({
+            permissionOptions: permissionOptions,
+            currentPermission: permissionOptions[0],
+          });
+        }).catch(error => {
+          let errMessage = Utils.getErrorMsg(error);
+          toaster.danger(errMessage);
+        });
+      }
     }
   }
 
@@ -260,7 +273,6 @@ class GenerateShareLink extends React.Component {
   }
 
   render() {
-
     if (this.state.isLoading) {
       return <Loading />;
     }
@@ -394,7 +406,7 @@ class GenerateShareLink extends React.Component {
                   <span>{gettext('Set permission')}</span>
                 </Label>
               </FormGroup>
-              {this.permissionOptions.map((item, index) => {
+              {this.state.permissionOptions.map((item, index) => {
                 return (
                   <FormGroup check className="permission" key={index}>
                     <Label className="form-check-label">
diff --git a/frontend/src/components/dialog/share-dialog.js b/frontend/src/components/dialog/share-dialog.js
index cca5b50285..627ad2b3a4 100644
--- a/frontend/src/components/dialog/share-dialog.js
+++ b/frontend/src/components/dialog/share-dialog.js
@@ -129,6 +129,7 @@ class ShareDialog extends React.Component {
                   itemPath={this.props.itemPath} 
                   repoID={this.props.repoID}
                   closeShareDialog={this.props.toggleDialog} 
+                  itemType={itemType}
                 />
               </TabPane>
             }
@@ -166,6 +167,7 @@ class ShareDialog extends React.Component {
 
   renderFileContent = () => {
     let activeTab = this.state.activeTab;
+    const { itemType } = this.props;
 
     return (
       <Fragment>
@@ -190,6 +192,7 @@ class ShareDialog extends React.Component {
                 itemPath={this.props.itemPath} 
                 repoID={this.props.repoID} 
                 closeShareDialog={this.props.toggleDialog}
+                itemType={itemType}
               />
             </TabPane>
             {activeTab === 'internalLink' &&
diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index 319534b627..6720ba3d14 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -494,11 +494,13 @@ class DirentListItem extends React.Component {
   }
 
   renderItemOperation = () => {
-    let { dirent, selectedDirentList, currentRepoInfo } = this.props;
-    if (currentRepoInfo.permission === 'cloud-edit' || currentRepoInfo.permission === 'preview') {
-      return '';
-    }
-    let showShareBtn = Utils.isHasPermissionToShare(currentRepoInfo, dirent.permission, dirent);
+    let { dirent, selectedDirentList } = this.props;
+
+    // no need to check whether show shareBtn or not.
+    // according to specification below, shareBtn aways show.
+    // check for "generate uploadlink" or other tabs should put inside the shareDialog.
+    // https://dev.seafile.com/seahub/lib/d6f300e7-bb2b-4722-b83e-cf45e370bfbc/file/seaf-server%20%E5%8A%9F%E8%83%BD%E8%AE%BE%E8%AE%A1/%E6%9D%83%E9%99%90%E7%9B%B8%E5%85%B3/%E8%B5%84%E6%96%99%E5%BA%93%E6%9D%83%E9%99%90%E8%A7%84%E8%8C%83.md
+    // let showShareBtn = Utils.isHasPermissionToShare(currentRepoInfo, dirent.permission, dirent);
 
     return (
       <Fragment>
@@ -512,11 +514,9 @@ class DirentListItem extends React.Component {
                       <i className="op-icon sf2-icon-download" title={gettext('Download')} onClick={this.onItemDownload}></i>
                     </li>
                   )}
-                  {showShareBtn && (
-                    <li className="operation-group-item">
-                      <i className="op-icon sf2-icon-share" title={gettext('Share')} onClick={this.onItemShare}></i>
-                    </li>
-                  )}
+                  <li className="operation-group-item">
+                    <i className="op-icon sf2-icon-share" title={gettext('Share')} onClick={this.onItemShare}></i>
+                  </li>
                   {dirent.permission === 'rw' && (
                     <li className="operation-group-item">
                       <i className="op-icon sf2-icon-delete" title={gettext('Delete')} onClick={this.onItemDelete}></i>
@@ -546,7 +546,7 @@ class DirentListItem extends React.Component {
                       <i className="op-icon sf2-icon-download" title={gettext('Download')} onClick={this.onItemDownload}></i>
                     </li>
                   )}
-                  {showShareBtn && (
+                  {(
                     <li className="operation-group-item">
                       <i className="op-icon sf2-icon-share" title={gettext('Share')} onClick={this.onItemShare}></i>
                     </li>
diff --git a/frontend/src/components/select-editor/select-editor.js b/frontend/src/components/select-editor/select-editor.js
index f8a202d1a7..5f6a4dfd16 100644
--- a/frontend/src/components/select-editor/select-editor.js
+++ b/frontend/src/components/select-editor/select-editor.js
@@ -46,6 +46,10 @@ class SelectEditor extends React.Component {
     });
   }
 
+  componentWillReceiveProps() {
+    this.setOptions();
+  }
+
   componentWillUnmount() {
     document.removeEventListener('click', this.onHideSelect);
   }
diff --git a/frontend/src/pages/share-admin/share-links.js b/frontend/src/pages/share-admin/share-links.js
index 05faf00698..6f0447913c 100644
--- a/frontend/src/pages/share-admin/share-links.js
+++ b/frontend/src/pages/share-admin/share-links.js
@@ -91,56 +91,60 @@ class Item extends Component {
   constructor(props) {
     super(props);
 
-    const item = this.props.item;
-
-    if (isPro) {
-      this.editOption = 'edit_download';
-      this.permissionOptions = ['preview_download', 'preview_only'];
-      this.updatePermissionOptions();
-    }
-
     this.state = {
-      currentPermission: isPro ? this.getCurrentPermission() : '',
       isOpIconShown: false,
       isOpMenuOpen: false, // for mobile
       isPermSelectDialogOpen: false, // for mobile
-      isLinkDialogOpen: false
+      isLinkDialogOpen: false,
+      permissionOptions: [],
+      currentPermission: '',
     };
   }
 
+  componentDidMount() {
+    if (isPro) {
+      this.updatePermissionOptions();
+    }
+  }
+
   updatePermissionOptions = () => {
     const item = this.props.item;
-    let options = this.permissionOptions;
-  
-    if (!Utils.isEditableOfficeFile(item.obj_name)) {
-      return ;
+    if (item.is_dir && item.path === '/') {
+      let permissionOptions = Utils.getShareLinkPermissionList('library', '', item.path);
+      this.setState({
+        permissionOptions: permissionOptions,
+      });
+    } else {
+      let { repo_id, path } = item;
+      let getDirentInfoAPI = item.is_dir ? seafileAPI.getDirInfo(repo_id, path) : seafileAPI.getFileInfo(repo_id, path);
+      getDirentInfoAPI.then((res) => {
+        let itemType = item.is_dir ? 'dir' : 'file';
+        let permission = res.data.permission;
+        let permissionOptions = Utils.getShareLinkPermissionList(itemType, permission, item.path);
+        this.setState({
+          permissionOptions: permissionOptions,
+        });
+      }).catch(error => {
+        let errMessage = Utils.getErrorMsg(error);
+        toaster.danger(errMessage);
+      });
     }
-
-    if (item.permissions.can_edit) {
-      options.push(this.editOption);
-      return ;
-    }
-
-    seafileAPI.getFileInfo(item.repo_id, item.path).then((res) => {
-      if (res.data.can_edit) {
-        options.push(this.editOption);
-        return ;
-      }
-    }).catch(error => {
-      return ;
+    this.setState({
+      currentPermission: this.getCurrentPermission(),
     });
   }
 
   getCurrentPermission = () => {
-    const options = this.permissionOptions;
     const { can_edit, can_download } = this.props.item.permissions;
     switch (`${can_edit} ${can_download}`) {
       case 'false true':
-        return options[0];
+        return 'preview_download';
       case 'false false':
-        return options[1];
+        return 'preview_only';
       case 'true true':
-        return this.editOption;
+        return 'edit_download';
+      case 'true false':
+        return 'cloud_edit';
     }
   }
 
@@ -214,7 +218,7 @@ class Item extends Component {
 
   render() {
     const item = this.props.item;
-    const { currentPermission, isOpIconShown, isPermSelectDialogOpen, isLinkDialogOpen } = this.state;
+    const { currentPermission, permissionOptions , isOpIconShown, isPermSelectDialogOpen, isLinkDialogOpen } = this.state;
 
     let iconUrl, objUrl;
     if (item.is_dir) {
@@ -242,7 +246,7 @@ class Item extends Component {
             isTextMode={true}
             isEditIconShow={isOpIconShown && !item.is_expired}
             currentPermission={currentPermission}
-            permissionOptions={this.permissionOptions}
+            permissionOptions={permissionOptions}
             onPermissionChanged={this.changePerm}
           />
         </td>
@@ -294,7 +298,7 @@ class Item extends Component {
         {isPermSelectDialogOpen &&
         <ShareLinkPermissionSelect
           currentPerm={currentPermission}
-          permissions={this.permissionOptions}
+          permissions={permissionOptions}
           changePerm={this.changePerm}
           toggleDialog={this.togglePermSelectDialog}
         />
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index fe8bb23189..d15a10542d 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -109,6 +109,39 @@ export const Utils = {
     }
   },
 
+  getShareLinkPermissionList: function(itemType, permission, path) {
+    // itemType: library, dir, file
+    // permission: rw, r, admin, cloud-edit, preview
+
+    // if item is library, can preview and download, no need to check
+    // if item is dir, check can download
+    // if item is file, check can download and check can edit
+
+    let editDownloadOption = 'edit_download';
+    let editOnly = 'cloud_edit';
+    let downloadOption = 'preview_download';
+    let permissionOptions = ['preview_only'];
+
+    if (itemType === 'library') {
+      permissionOptions.push(downloadOption);
+    } else if (itemType === 'dir') {
+      if (permission == 'rw' || permission == 'admin' || permission == 'r') {
+        permissionOptions.push(downloadOption);
+      }
+    } else if (itemType === 'file') {
+      if (permission == 'rw' || permission == 'admin' || permission == 'r') {
+        permissionOptions.push(downloadOption);
+      }
+      if (this.isEditableOfficeFile(path) && (permission == 'rw' || permission == 'admin')) {
+        permissionOptions.push(editDownloadOption);
+      }
+      if (this.isEditableOfficeFile(path) && (permission == 'cloud-edit')) {
+        permissionOptions.push(editOnly);
+      }
+    }
+    return permissionOptions;
+  },
+
   isEditableOfficeFile: function(filename) {
     // no file ext
     if (filename.lastIndexOf('.') == -1) {
@@ -562,7 +595,19 @@ export const Utils = {
             "can_download": true
           }
         };
+      case 'cloud_edit':
+        return {
+          value: permission,
+          text: gettext('Edit on cloud'),
+          permissionDetails: {
+            'can_edit': true,
+            "can_download": false
+          }
+        };
     }
+    return {
+      text: '',
+    };
   },
 
   formatSize: function(options) {
diff --git a/seahub/api2/endpoints/dir.py b/seahub/api2/endpoints/dir.py
index 9e3ed3775b..af82120415 100644
--- a/seahub/api2/endpoints/dir.py
+++ b/seahub/api2/endpoints/dir.py
@@ -563,7 +563,8 @@ class DirDetailView(APIView):
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
         # permission check
-        if not check_folder_permission(request, repo_id, path):
+        permission = check_folder_permission(request, repo_id, path)
+        if not permission:
             error_msg = 'Permission denied.'
             return api_error(status.HTTP_403_FORBIDDEN, error_msg)
 
@@ -579,6 +580,7 @@ class DirDetailView(APIView):
             'path': path,
             'name': dir_obj.obj_name,
             'mtime': timestamp_to_isoformat_timestr(dir_obj.mtime),
+            'permission': permission,
         }
 
         return Response(dir_info)
diff --git a/seahub/api2/endpoints/share_links.py b/seahub/api2/endpoints/share_links.py
index 32a34f5931..b95209970e 100644
--- a/seahub/api2/endpoints/share_links.py
+++ b/seahub/api2/endpoints/share_links.py
@@ -29,7 +29,6 @@ from seahub.utils import gen_shared_link, is_org_context, normalize_file_path, \
         normalize_dir_path, is_pro_version, get_file_type_and_ext
 from seahub.utils.file_op import if_locked_by_online_office
 from seahub.utils.file_types import IMAGE, VIDEO, XMIND
-from seahub.views import check_folder_permission
 from seahub.utils.timeutils import datetime_to_isoformat_timestr, \
         timestamp_to_isoformat_timestr
 from seahub.utils.repo import parse_repo_perm
@@ -288,11 +287,12 @@ class ShareLinks(APIView):
 
             return api_error(status.HTTP_404_NOT_FOUND, error_msg)
 
-        if parse_repo_perm(check_folder_permission(request, repo_id, path)).can_download is False:
+        username = request.user.username
+        permission_by_path = seafile_api.check_permission_by_path(repo_id, path, username)
+        if parse_repo_perm(permission_by_path).can_generate_share_link is False:
             error_msg = 'Permission denied.'
             return api_error(status.HTTP_403_FORBIDDEN, error_msg)
 
-        username = request.user.username
         org_id = request.user.org.org_id if is_org_context(request) else None
         if s_type == 'f':
             fs = FileShare.objects.get_file_link_by_path(username, repo_id, path)
diff --git a/seahub/utils/repo.py b/seahub/utils/repo.py
index 91520e7b3f..48703750f4 100644
--- a/seahub/utils/repo.py
+++ b/seahub/utils/repo.py
@@ -54,6 +54,7 @@ def parse_repo_perm(perm):
         'can_edit_on_web',             # edit files on web
         'can_copy',                    # copy files/folders on web
         'can_preview',                 # preview files on web
+        'can_generate_share_link',     # generate share link
     ])
 
     RP.can_download = True if perm in [
@@ -70,6 +71,10 @@ def parse_repo_perm(perm):
         PERMISSION_READ, PERMISSION_READ_WRITE, PERMISSION_ADMIN,
         PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT
     ] else False
+    RP.can_generate_share_link = True if perm in [
+        PERMISSION_READ_WRITE, PERMISSION_READ, PERMISSION_ADMIN,
+        PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT
+    ] else False
     return RP
 
 def list_dir_by_path(cmmt, path):

From a30d0d3469f33f6d2d70720fce2a0705b26d2e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Mon, 14 Oct 2019 11:52:02 +0800
Subject: [PATCH 4/9] repair wiki scroll bug (#4147)

---
 frontend/src/css/wiki.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/css/wiki.css b/frontend/src/css/wiki.css
index 67cb86e845..274440e380 100644
--- a/frontend/src/css/wiki.css
+++ b/frontend/src/css/wiki.css
@@ -68,6 +68,7 @@ img[src=""] {
 .cur-view-content {
   display: flex;
   flex-direction: column;
+  overflow: hidden;
 }
 
 .cur-view-content .wiki-page-container {

From 1790940bc8be4f64db35d398894cbc1c5e904a3f Mon Sep 17 00:00:00 2001
From: Leo <is.li.xiaoyu@qq.com>
Date: Tue, 15 Oct 2019 10:15:04 +0800
Subject: [PATCH 5/9] delete user permission 'can_use_wiki' (#4148)

---
 frontend/src/components/main-side-nav.js    |  4 ++--
 frontend/src/pages/wikis/wikis.js           |  6 +++---
 frontend/src/utils/constants.js             |  1 -
 seahub/base/accounts.py                     |  8 +-------
 seahub/role_permissions/settings.py         |  2 --
 seahub/templates/base_for_react.html        |  1 -
 seahub/views/__init__.py                    |  1 -
 tests/api/endpoints/test_wikis.py           | 10 ----------
 tests/seahub/base/test_accounts.py          | 16 ++++++++--------
 tests/seahub/role_permissions/test_utils.py |  2 +-
 10 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js
index 2a3b57d5cd..bb5d3cfe78 100644
--- a/frontend/src/components/main-side-nav.js
+++ b/frontend/src/components/main-side-nav.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from '@reach/router';
 import { Badge } from 'reactstrap';
-import { gettext, siteRoot, enableWiki, canAddRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople } from '../utils/constants';
+import { gettext, siteRoot, canPublishRepo, canAddRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople } from '../utils/constants';
 import { seafileAPI } from '../utils/seafile-api';
 import { Utils } from '../utils/utils';
 import toaster from './toast';
@@ -229,7 +229,7 @@ class MainSideNav extends React.Component {
                 </Link>
               </li>
             }
-            {enableWiki &&
+            {canPublishRepo &&
               <li className="nav-item">
                 <Link className={`nav-link ellipsis ${this.getActiveClass('published')}`} to={siteRoot + 'published/'} title={gettext('Published Libraries')} onClick={(e) => this.tabItemClick(e, 'published')}>
                   <span className="sf2-icon-wiki-view" aria-hidden="true"></span>
diff --git a/frontend/src/pages/wikis/wikis.js b/frontend/src/pages/wikis/wikis.js
index 09cc2012e8..2eed5ad851 100644
--- a/frontend/src/pages/wikis/wikis.js
+++ b/frontend/src/pages/wikis/wikis.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Button } from 'reactstrap';
 import MediaQuery from 'react-responsive';
 import { seafileAPI } from '../../utils/seafile-api';
-import { gettext, loginUrl, canPublishRepo } from '../../utils/constants';
+import { gettext, loginUrl } from '../../utils/constants';
 import toaster from '../../components/toast';
 import ModalPortal from '../../components/modal-portal';
 import EmptyTip from '../../components/empty-tip';
@@ -130,14 +130,14 @@ class Wikis extends Component {
           <div className="cur-view-toolbar">
             <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
             <div className="operation">
-              {canPublishRepo && <Fragment>
+              <Fragment>
                 <MediaQuery query="(min-width: 768px)">
                   <Button className="btn btn-secondary operation-item" onClick={this.onSelectToggle}>{gettext('Publish a Library')}</Button>
                 </MediaQuery>
                 <MediaQuery query="(max-width: 767.8px)">
                 <span className="sf2-icon-plus mobile-toolbar-icon" title={gettext('Publish a Library')} onClick={this.onSelectToggle}></span>
                 </MediaQuery>
-              </Fragment>}
+              </Fragment>
             </div>
           </div>
           <CommonToolbar onSearchedClick={this.props.onSearchedClick} />
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index e303f42ee4..254d8f48d9 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -44,7 +44,6 @@ export const shareLinkExpireDaysMin = window.app.pageOptions.shareLinkExpireDays
 export const shareLinkExpireDaysMax = window.app.pageOptions.shareLinkExpireDaysMax;
 export const shareLinkExpireDaysDefault = window.app.pageOptions.shareLinkExpireDaysDefault;
 export const maxFileName = window.app.pageOptions.maxFileName;
-export const enableWiki = window.app.pageOptions.enableWiki;
 export const canPublishRepo = window.app.pageOptions.canPublishRepo;
 export const enableEncryptedLibrary = window.app.pageOptions.enableEncryptedLibrary;
 export const enableRepoHistorySetting = window.app.pageOptions.enableRepoHistorySetting;
diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py
index 4ebbb98c4d..04d18b606d 100644
--- a/seahub/base/accounts.py
+++ b/seahub/base/accounts.py
@@ -216,14 +216,8 @@ class UserPermissions(object):
     def storage_ids(self):
         return self._get_perm_by_roles('storage_ids')
 
-    def can_use_wiki(self):
-        if not settings.ENABLE_WIKI:
-            return False
-
-        return self._get_perm_by_roles('can_use_wiki')
-
     def can_publish_repo(self):
-        if not self.can_use_wiki():
+        if not settings.ENABLE_WIKI:
             return False
 
         return self._get_perm_by_roles('can_publish_repo')
diff --git a/seahub/role_permissions/settings.py b/seahub/role_permissions/settings.py
index b651329df6..7d1978fde1 100644
--- a/seahub/role_permissions/settings.py
+++ b/seahub/role_permissions/settings.py
@@ -40,7 +40,6 @@ DEFAULT_ENABLED_ROLE_PERMISSIONS = {
         'can_export_files_via_mobile_client': True,
         'storage_ids': [],
         'role_quota': '',
-        'can_use_wiki': True,
         'can_publish_repo': True,
     },
     GUEST_USER: {
@@ -60,7 +59,6 @@ DEFAULT_ENABLED_ROLE_PERMISSIONS = {
         'can_export_files_via_mobile_client': False,
         'storage_ids': [],
         'role_quota': '',
-        'can_use_wiki': False,
         'can_publish_repo': False,
     },
 }
diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html
index 8f1349df23..189810a25e 100644
--- a/seahub/templates/base_for_react.html
+++ b/seahub/templates/base_for_react.html
@@ -82,7 +82,6 @@
             shareLinkExpireDaysMin: "{{ share_link_expire_days_min }}",
             shareLinkExpireDaysMax: "{{ share_link_expire_days_max }}",
             maxFileName: "{{ max_file_name }}",
-            enableWiki: {% if user.permissions.can_use_wiki %} true {% else %} false {% endif %},
             canPublishRepo: {% if user.permissions.can_publish_repo %} true {% else %} false {% endif %},
             enableEncryptedLibrary: {% if enable_encrypted_library %} true {% else %} false {% endif %},
             enableRepoHistorySetting: {% if enable_repo_history_setting %} true {% else %} false {% endif %},
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 5280842601..3a836023d1 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -747,7 +747,6 @@ def libraries(request):
             "allow_public_share": allow_public_share,
             "guide_enabled": guide_enabled,
             "sub_lib_enabled": sub_lib_enabled,
-            'enable_wiki': request.user.permissions.can_use_wiki(),
             'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER,
             'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD,
             'resumable_upload_file_block_size': settings.RESUMABLE_UPLOAD_FILE_BLOCK_SIZE,
diff --git a/tests/api/endpoints/test_wikis.py b/tests/api/endpoints/test_wikis.py
index 249f5783a0..8188483798 100644
--- a/tests/api/endpoints/test_wikis.py
+++ b/tests/api/endpoints/test_wikis.py
@@ -13,9 +13,6 @@ from seahub.wiki.models import Wiki
 from seahub.role_permissions.settings import ENABLED_ROLE_PERMISSIONS
 from seahub.test_utils import BaseTestCase
 
-TEST_CAN_USE_WIKI_FALSE = copy.deepcopy(ENABLED_ROLE_PERMISSIONS)
-TEST_CAN_USE_WIKI_FALSE['default']['can_use_wiki'] = False
-
 TEST_CAN_PUBLISH_REPO_FALSE = copy.deepcopy(ENABLED_ROLE_PERMISSIONS)
 TEST_CAN_PUBLISH_REPO_FALSE['default']['can_publish_repo'] = False
 
@@ -96,13 +93,6 @@ class WikisViewTest(BaseTestCase):
         })
         self.assertEqual(403, resp.status_code)
 
-    def test_403_when_add_wiki_with_can_use_wiki_false(self):
-        with patch('seahub.role_permissions.utils.ENABLED_ROLE_PERMISSIONS', TEST_CAN_USE_WIKI_FALSE):
-            resp = self.client.post(self.url, {
-                'repo_id': self.repo.id,
-            })
-            self.assertEqual(403, resp.status_code)
-
     def test_403_when_add_wiki_with_can_generate_share_link_false(self):
         with patch('seahub.role_permissions.utils.ENABLED_ROLE_PERMISSIONS', TEST_CAN_GENERATE_SHARE_LINK):
             resp = self.client.post(self.url, {
diff --git a/tests/seahub/base/test_accounts.py b/tests/seahub/base/test_accounts.py
index 591347e2cf..394f942c38 100644
--- a/tests/seahub/base/test_accounts.py
+++ b/tests/seahub/base/test_accounts.py
@@ -13,8 +13,8 @@ from mock import patch
 TEST_CAN_ADD_PUBLICK_REPO_TRUE = copy.deepcopy(ENABLED_ROLE_PERMISSIONS)
 TEST_CAN_ADD_PUBLICK_REPO_TRUE['default']['can_add_public_repo'] = True
 
-TEST_PUBLISH_REPO_CAN_USE_WIKI_FALSE = copy.deepcopy(ENABLED_ROLE_PERMISSIONS)
-TEST_PUBLISH_REPO_CAN_USE_WIKI_FALSE['default']['can_use_wiki'] = False
+TEST_PUBLISH_REPO_CAN_PUBLISH_REPO_FALSE = copy.deepcopy(ENABLED_ROLE_PERMISSIONS)
+TEST_PUBLISH_REPO_CAN_PUBLISH_REPO_FALSE['default']['can_publish_repo'] = False
 
 CLOUD_MODE_TRUE = True
 MULTI_TENANCY_TRUE = True
@@ -108,20 +108,20 @@ class UserPermissionsTest(BaseTestCase):
         assert self.user.permissions.can_add_public_repo() is False
 
     def test_can_publish_repo_permission(self):
-        # enableWIKI = True, and can_use_wiki = True
+        # enableWIKI = True, and can_publish_repo = True
         assert self.user.permissions._get_perm_by_roles('can_publish_repo') is True
         assert self.user.permissions.can_publish_repo() is True
 
     @override_settings(ENABLE_WIKI=False)
     def test_can_publish_repo_permission_with_enable_wiki_False(self):
-        # enableWIKI = False, and can_use_wiki = True
+        # enableWIKI = False, and can_publish_repo = True
         assert self.user.permissions._get_perm_by_roles('can_publish_repo') is True
         assert self.user.permissions.can_publish_repo() is False
 
-    def test_can_publish_repo_permission_with_can_use_wiki_False(self):
-        # enableWIKI = True, and can_use_wiki = False
-        with patch('seahub.role_permissions.utils.ENABLED_ROLE_PERMISSIONS', TEST_PUBLISH_REPO_CAN_USE_WIKI_FALSE):
-            assert self.user.permissions._get_perm_by_roles('can_publish_repo') is True
+    def test_can_publish_repo_permission_with_can_publish_repo_False(self):
+        # enableWIKI = True, and can_publish_repo = False
+        with patch('seahub.role_permissions.utils.ENABLED_ROLE_PERMISSIONS', TEST_PUBLISH_REPO_CAN_PUBLISH_REPO_FALSE):
+            assert self.user.permissions._get_perm_by_roles('can_publish_repo') is False
             assert self.user.permissions.can_publish_repo() is False
 
 
diff --git a/tests/seahub/role_permissions/test_utils.py b/tests/seahub/role_permissions/test_utils.py
index 54ea696ffd..597c178474 100644
--- a/tests/seahub/role_permissions/test_utils.py
+++ b/tests/seahub/role_permissions/test_utils.py
@@ -11,4 +11,4 @@ class UtilsTest(BaseTestCase):
         assert DEFAULT_USER in get_available_roles()
 
     def test_get_enabled_role_permissions_by_role(self):
-        assert len(get_enabled_role_permissions_by_role(DEFAULT_USER).keys()) == 18
+        assert len(get_enabled_role_permissions_by_role(DEFAULT_USER).keys()) == 17

From 295decc039b3e46391482a77d4c7908fafff3c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Tue, 15 Oct 2019 10:16:48 +0800
Subject: [PATCH 6/9] repair wechat bug (#4150)

---
 frontend/src/app.js                                     | 9 +++++++--
 frontend/src/pages/lib-content-view/lib-content-view.js | 9 +++++++--
 frontend/src/utils/utils.js                             | 7 +++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app.js b/frontend/src/app.js
index 78abf153af..cf418ebea3 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -135,8 +135,13 @@ class App extends Component {
       navigate(url, {repalce: true});
     } else {
       let url = siteRoot + 'lib/' + selectedItem.repo_id + '/file' + Utils.encodePath(selectedItem.path);
-      let newWindow = window.open('about:blank');
-      newWindow.location.href = url;
+      let isWeChat = Utils.isWeChat();
+      if (!isWeChat) {
+        let newWindow = window.open('about:blank');
+        newWindow.location.href = url;
+      } else {
+        location.href = url;
+      }
     }
   }
 
diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js
index 9d86854216..d9e626e4de 100644
--- a/frontend/src/pages/lib-content-view/lib-content-view.js
+++ b/frontend/src/pages/lib-content-view/lib-content-view.js
@@ -1068,9 +1068,14 @@ class LibContentView extends React.Component {
       if (this.state.currentMode === 'column' && Utils.isMarkdownFile(direntPath)) {
         this.showColumnMarkdownFile(direntPath);
       } else {
-        const w=window.open('about:blank');
         const url = siteRoot + 'lib/' + repoID + '/file' + Utils.encodePath(direntPath);
-        w.location.href = url;
+        let isWeChat = Utils.isWeChat();
+        if (!isWeChat) {
+          let newWindow = window.open('about:blank');
+          newWindow.location.href = url;
+        } else {
+          location.href = url;
+        }
       }
     }
   }
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index d15a10542d..905cae7328 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -38,6 +38,13 @@ export const Utils = {
     return window.innerWidth >= 768;
   },
 
+  isWeChat: function() {
+    let ua = window.navigator.userAgent.toLowerCase();
+    let isWeChat = ua.match(/MicroMessenger/i) == 'micromessenger';
+    let isEnterpriseWeChat = ua.match(/MicroMessenger/i) == 'micromessenger' && ua.match(/wxwork/i) == 'wxwork';
+    return isEnterpriseWeChat || isWeChat;
+  },
+
   FILEEXT_ICON_MAP: {
 
     // text file

From 9d6d7fd14631249541367a927bc44b09cec56f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Tue, 15 Oct 2019 10:37:06 +0800
Subject: [PATCH 7/9] repair shraed repo link bug (#4151)

---
 frontend/src/pages/shared-libs/shared-libs.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/shared-libs/shared-libs.js b/frontend/src/pages/shared-libs/shared-libs.js
index ee00a183b0..4f4760f4e7 100644
--- a/frontend/src/pages/shared-libs/shared-libs.js
+++ b/frontend/src/pages/shared-libs/shared-libs.js
@@ -208,7 +208,7 @@ class Item extends Component {
     let iconVisibility = this.state.showOpIcon ? '' : ' invisible';
     let shareIconClassName = 'op-icon sf2-icon-share repo-share-btn' + iconVisibility; 
     let leaveShareIconClassName = 'op-icon sf2-icon-x3' + iconVisibility;
-
+    let shareRepoUrl =`${siteRoot}library/${data.repo_id}/${Utils.encodePath(data.repo_name)}/`;
     const desktopItem = (
       <Fragment>
         <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
@@ -217,7 +217,7 @@ class Item extends Component {
             {this.state.isStarred && <i className="fas fa-star cursor-pointer" onClick={this.onStarRepo}></i>}
           </td>
           <td><img src={data.icon_url} title={data.icon_title} alt={data.icon_title} width="24" /></td>
-          <td><Link to={`${siteRoot}library/${data.repo_id}/${data.repo_name}/`}>{data.repo_name}</Link></td>
+          <td><Link to={shareRepoUrl}>{data.repo_name}</Link></td>
           <td>
             {(isPro && data.is_admin) &&
               <a href="#" className={shareIconClassName} title={gettext('Share')} onClick={this.share}></a>
@@ -251,7 +251,7 @@ class Item extends Component {
         <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
           <td><img src={data.icon_url} title={data.icon_title} alt={data.icon_title} width="24" /></td>
           <td>
-            <Link to={`${siteRoot}library/${data.repo_id}/${data.repo_name}/`}>{data.repo_name}</Link><br />
+            <Link to={shareRepoUrl}>{data.repo_name}</Link><br />
             <span className="item-meta-info" title={data.owner_contact_email}>{data.owner_name}</span>
             <span className="item-meta-info">{data.size}</span>
             <span className="item-meta-info" title={moment(data.last_modified).format('llll')}>{moment(data.last_modified).fromNow()}</span>

From f95d9d65bcc4289b9ef120bf9ee993d352e89977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Fri, 18 Oct 2019 15:28:03 +0800
Subject: [PATCH 8/9] repair bug (#4157)

* repair bug

* update version
---
 frontend/package-lock.json | 6 +++---
 frontend/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 35060c2cc6..babad618dc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -118,9 +118,9 @@
       }
     },
     "@seafile/resumablejs": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/@seafile/resumablejs/-/resumablejs-1.1.13.tgz",
-      "integrity": "sha512-GhLgburkCrankp8H0EWNZoQOdQ9vXvuWsD9uKj0JCNwy3kyDty7/qqpXtj6RHN7fzqF9LRoGpOMVdkS4SecPKQ=="
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@seafile/resumablejs/-/resumablejs-1.1.15.tgz",
+      "integrity": "sha512-DJPhjBRLENONdDNaaKRckWWtwXvoqfJcRdSk01FbjmZ3DWpbIwebd/vfuB4qJwm0R2j2qzdEVhgxe6wDYS/n9A=="
     },
     "@seafile/seafile-editor": {
       "version": "0.2.60",
diff --git a/frontend/package.json b/frontend/package.json
index 980da476ea..e629005b2f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@reach/router": "^1.2.0",
-    "@seafile/resumablejs": "^1.1.13",
+    "@seafile/resumablejs": "^1.1.15",
     "@seafile/seafile-editor": "^0.2.60",
     "MD5": "^1.3.0",
     "autoprefixer": "7.1.6",

From 9e24304d127e44f9db81802740121856cb83376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Mon, 21 Oct 2019 16:32:26 +0800
Subject: [PATCH 9/9] update seafile-js version (#4167)

---
 frontend/package-lock.json | 12 ++++++------
 frontend/package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index babad618dc..012149cefc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -734,9 +734,9 @@
       },
       "dependencies": {
         "is-buffer": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
         }
       }
     },
@@ -11377,9 +11377,9 @@
       }
     },
     "seafile-js": {
-      "version": "0.2.120",
-      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.120.tgz",
-      "integrity": "sha512-3TrYkDTh4tC20S7StCetpu+RTXKQma0EUDrJ1iXjlhA8q0u8H8fiGmdl+nJv0D7fYQE9DydwDVyAZAj7aj0Lew==",
+      "version": "0.2.129",
+      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.129.tgz",
+      "integrity": "sha512-9JUfHZwpLku88Xmd7DaakAyUltKq8Ix8k7fpBZ9ph3ZkfTKvAnPqcDJfC6urE4BG41tPVoPjePxJobJx8LYokw==",
       "requires": {
         "axios": "^0.18.0",
         "form-data": "^2.3.2",
diff --git a/frontend/package.json b/frontend/package.json
index e629005b2f..f935af3d7a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -36,7 +36,7 @@
     "react-responsive": "^6.1.2",
     "react-select": "^2.4.1",
     "reactstrap": "^6.4.0",
-    "seafile-js": "^0.2.120",
+    "seafile-js": "^0.2.129",
     "socket.io-client": "^2.2.0",
     "sw-precache-webpack-plugin": "0.11.4",
     "unified": "^7.0.0",