haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.1' into master

Browse Source
This commit is contained in:
lian
2021-02-05 11:55:34 +08:00
parent 1cb10e4dd5 f86d164d17
commit c29a571826
39 changed files with 488 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/utils/constants.js
View File

@@ -3,6 +3,7 @@ export const gettext = window.gettext;
export const siteRoot = window.app.config.siteRoot;
export const loginUrl = window.app.config.loginUrl;
export const logoutUrl = window.app.config.logoutUrl;
export const avatarInfo = window.app.config.avatarInfo;
export const logoPath = window.app.config.logoPath;
export const mediaUrl = window.app.config.mediaUrl;

6
frontend/src/utils/utils.js
View File

@@ -484,7 +484,7 @@ export const Utils = {
return list;
},
getFileOperationList: function(currentRepoInfo, dirent, isContextmenu) {
getFileOperationList: function(isRepoOwner, currentRepoInfo, dirent, isContextmenu) {
let list = [];
const { SHARE, DOWNLOAD, DELETE, RENAME, MOVE, COPY, TAGS, UNLOCK, LOCK,
COMMENT, HISTORY, ACCESS_LOG, OPEN_VIA_CLIENT } = TextTranslation;
@@ -516,7 +516,7 @@ export const Utils = {
if (isPro) {
if (dirent.is_locked) {
if (dirent.locked_by_me || dirent.lock_owner == 'OnlineOffice') {
if (dirent.locked_by_me || dirent.lock_owner == 'OnlineOffice' || isRepoOwner || currentRepoInfo.is_admin) {
list.push(UNLOCK);
}
} else {
@@ -551,7 +551,7 @@ export const Utils = {
getDirentOperationList: function(isRepoOwner, currentRepoInfo, dirent, isContextmenu) {
return dirent.type == 'dir' ?
Utils.getFolderOperationList(isRepoOwner, currentRepoInfo, dirent, isContextmenu) :
Utils.getFileOperationList(currentRepoInfo, dirent, isContextmenu);
Utils.getFileOperationList(isRepoOwner, currentRepoInfo, dirent, isContextmenu);
},
sharePerms: function(permission) {