diff --git a/frontend/src/components/dialog/custom-permission/custom-permission-editor.js b/frontend/src/components/dialog/custom-permission/custom-permission-editor.js index 1f87c048d7..a2a2d12b21 100644 --- a/frontend/src/components/dialog/custom-permission/custom-permission-editor.js +++ b/frontend/src/components/dialog/custom-permission/custom-permission-editor.js @@ -157,6 +157,12 @@ class CustomPermissionEditor extends React.Component { {gettext('Download')} + + + diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js index c3054e936d..0a18a9b54a 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-view.js +++ b/frontend/src/components/dirent-list-view/dirent-list-view.js @@ -332,11 +332,11 @@ class DirentListView extends React.Component { if (this.props.selectedDirentList.length === 0) { let id = 'dirent-container-menu'; - + // custom permission judgement if (isCustomPermission) { - const { modify } = customPermission.permission; - if (!modify) return; + const { create: canCreate } = customPermission.permission; + if (!canCreate) return; } let menuList = [TextTranslation.NEW_FOLDER, TextTranslation.NEW_FILE]; diff --git a/frontend/src/components/toolbar/dir-operation-toolbar.js b/frontend/src/components/toolbar/dir-operation-toolbar.js index 59be26a4ad..cebc8a7552 100644 --- a/frontend/src/components/toolbar/dir-operation-toolbar.js +++ b/frontend/src/components/toolbar/dir-operation-toolbar.js @@ -168,11 +168,11 @@ class DirOperationToolbar extends React.Component { const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm); let canUpload = true; - let canModify = true; + let canCreate = true; if (isCustomPermission) { const { permission } = customPermission; canUpload = permission.upload; - canModify = permission.modify; + canCreate = permission.create; } let content = null; @@ -196,7 +196,7 @@ class DirOperationToolbar extends React.Component { } )} - {canModify && + {canCreate && {this.state.isCreateMenuShow && ( @@ -223,7 +223,7 @@ class DirOperationToolbar extends React.Component { {canUpload && ( {gettext('Upload')} )} - {canModify && ( + {canCreate && ( {gettext('New Folder')} {gettext('New File')} diff --git a/frontend/src/components/tree-view/tree-node-view.js b/frontend/src/components/tree-view/tree-node-view.js index 75b3e9730d..e3d1e763e0 100644 --- a/frontend/src/components/tree-view/tree-node-view.js +++ b/frontend/src/components/tree-view/tree-node-view.js @@ -207,7 +207,7 @@ class TreeNodeView extends React.Component { let menuList = [RENAME, DELETE, COPY, MOVE, OPEN_VIA_CLIENT]; if (node.object.type === 'dir') { - menuList = [NEW_FOLDER, NEW_FILE, COPY, MOVE, RENAME, DELETE]; + menuList = [NEW_FOLDER, NEW_FILE, COPY, MOVE, RENAME, DELETE]; } const { userPerm } = this.props; @@ -217,11 +217,11 @@ class TreeNodeView extends React.Component { } menuList = []; - const { modify: canModify, delete: canDelete, copy: canCopy } = customPermission.permission; - if (node.object.type === 'dir') { - canModify && menuList.push(NEW_FOLDER, NEW_FILE); + const { create: canCreate, modify: canModify, delete: canDelete, copy: canCopy } = customPermission.permission; + if (node.object.type === 'dir') { + canCreate && menuList.push(NEW_FOLDER, NEW_FILE); } - + canCopy && menuList.push(COPY); canModify && menuList.push(MOVE, RENAME); canDelete && menuList.push(DELETE); diff --git a/frontend/src/components/tree-view/tree-view.js b/frontend/src/components/tree-view/tree-view.js index 4190736d61..1b11face96 100644 --- a/frontend/src/components/tree-view/tree-view.js +++ b/frontend/src/components/tree-view/tree-view.js @@ -270,16 +270,16 @@ class TreeView extends React.Component { menuList = []; - const { modify: canModify, delete: canDelete, copy: canCopy } = customPermission.permission; + const { create: canCreate, modify: canModify, delete: canDelete, copy: canCopy } = customPermission.permission; if (!node) { - canModify && menuList.push(NEW_FOLDER, NEW_FILE); + canCreate && menuList.push(NEW_FOLDER, NEW_FILE); return menuList; } - if (node.object.type === 'dir') { - canModify && menuList.push(NEW_FOLDER, NEW_FILE); + if (node.object.type === 'dir') { + canCreate && menuList.push(NEW_FOLDER, NEW_FILE); } - + canCopy && menuList.push(COPY); canModify && menuList.push(MOVE, RENAME); canDelete && menuList.push(DELETE);