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

delete details choice in menu (#3239)

Browse Source
This commit is contained in:
Michael An
2019-04-11 11:13:36 +08:00
committed by Daniel Pan
parent b54bea4ecb
commit aea14dd74a
10 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dir-view-mode/dir-list-view.js
View File

@@ -31,7 +31,6 @@ const propTypes = {
onItemMove: PropTypes.func.isRequired,
onItemCopy: PropTypes.func.isRequired,
onDirentClick: PropTypes.func.isRequired,
onItemDetails: PropTypes.func.isRequired,
updateDirent: PropTypes.func.isRequired,
isAllItemSelected: PropTypes.bool.isRequired,
onAllItemSelected: PropTypes.func.isRequired,
@@ -156,7 +155,6 @@ class DirListView extends React.Component {
onItemMove={this.props.onItemMove}
onItemCopy={this.props.onItemCopy}
onDirentClick={this.props.onDirentClick}
onItemDetails={this.props.onItemDetails}
isDirentListLoading={this.props.isDirentListLoading}
updateDirent={this.props.updateDirent}
isAllItemSelected={this.props.isAllItemSelected}

8
frontend/src/components/dirent-list-view/dirent-list-item.js
View File

@@ -31,7 +31,6 @@ const propTypes = {
onItemRename: PropTypes.func.isRequired,
onItemMove: PropTypes.func.isRequired,
onItemCopy: PropTypes.func.isRequired,
onItemDetails: PropTypes.func.isRequired,
onDirentClick: PropTypes.func.isRequired,
updateDirent: PropTypes.func.isRequired,
showImagePopup: PropTypes.func.isRequired,
@@ -242,9 +241,6 @@ class DirentListItem extends React.Component {
case 'Permission':
this.onPermissionItem();
break;
case 'Details':
this.onDetailsItem();
break;
case 'Unlock':
this.onUnlockItem();
break;
@@ -298,10 +294,6 @@ class DirentListItem extends React.Component {
}
onDetailsItem = () => {
this.props.onItemDetails(this.props.dirent);
}
onLockItem = () => {
let repoID = this.props.repoID;
let filePath = this.getDirentPath(this.props.dirent);

6
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -30,7 +30,6 @@ const propTypes = {
onItemMove: PropTypes.func.isRequired,
onItemCopy: PropTypes.func.isRequired,
onDirentClick: PropTypes.func.isRequired,
onItemDetails: PropTypes.func.isRequired,
updateDirent: PropTypes.func.isRequired,
switchAnotherMenuToShow: PropTypes.func,
appMenuType: PropTypes.oneOf(['list_view_contextmenu', 'item_contextmenu', 'tree_contextmenu', 'item_op_menu']),
@@ -98,10 +97,6 @@ class DirentListView extends React.Component {
this.onFreezedItem();
}
onItemDetails = (dirent) => {
this.props.onItemDetails(dirent);
}
onCreateFileToggle = () => {
this.setState({
isCreateFileDialogShow: !this.state.isCreateFileDialogShow,
@@ -296,7 +291,6 @@ class DirentListView extends React.Component {
onFreezedItem={this.onFreezedItem}
onUnfreezedItem={this.onUnfreezedItem}
onDirentClick={this.props.onDirentClick}
onItemDetails={this.onItemDetails}
showImagePopup={this.showImagePopup}
switchAnotherMenuToShow={this.props.switchAnotherMenuToShow}
appMenuType={this.props.appMenuType}

11
frontend/src/components/dirent-list-view/dirent-menu.js
View File

@@ -42,15 +42,15 @@ class DirentMenu extends React.Component {
if (type === 'dir' && permission === 'rw') {
let menuList = [];
if (can_set_folder_perm) {
menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Details', 'Divider', 'Open via Client'];
menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Divider', 'Open via Client'];
} else {
menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Details', 'Divider', 'Open via Client'];
menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Open via Client'];
}
return menuList;
}
if (type === 'dir' && permission === 'r') {
let menuList = currentRepoInfo.encrypted ? ['Copy', 'Details'] : ['Details'];
let menuList = currentRepoInfo.encrypted ? ['Copy'] : [];
return menuList;
}
@@ -78,7 +78,6 @@ class DirentMenu extends React.Component {
if (fileAuditEnabled) {
menuList.push('Access Log');
}
menuList.push('Details');
menuList.push('Divider');
menuList.push('Open via Client');
return menuList;
@@ -93,7 +92,6 @@ class DirentMenu extends React.Component {
menuList.push('Comment');
}
menuList.push('History');
menuList.push('Details');
return menuList;
}
}
@@ -113,9 +111,6 @@ class DirentMenu extends React.Component {
case 'Permission':
translateResult = gettext('Permission');
break;
case 'Details':
translateResult = gettext('Details');
break;
case 'Unlock':
translateResult = gettext('Unlock');
break;

11
frontend/src/components/dirent-list-view/dirent-right-menu.js
View File

@@ -59,15 +59,15 @@ class DirentRightMenu extends React.Component {
let subscriptList = showShare ? ['Share', 'Download', 'Delete', 'Divider'] : ['Download', 'Delete', 'Divider'];
let menuList = [];
if (can_set_folder_perm) {
menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Details', 'Divider', 'Open via Client'];
menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Divider', 'Open via Client'];
} else {
menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Details', 'Divider', 'Open via Client'];
menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Open via Client'];
}
return menuList;
}
if (type === 'dir' && permission === 'r') {
let menuList = showShare ? ['Share', 'Download','Delete', 'Divider', 'Copy', 'Details'] : ['Download', 'Delete', 'Divider', 'Details'];
let menuList = showShare ? ['Share', 'Download','Delete', 'Divider', 'Copy'] : ['Download', 'Delete'];
return menuList;
}
@@ -96,7 +96,6 @@ class DirentRightMenu extends React.Component {
if (fileAuditEnabled) {
menuList.push('Access Log');
}
menuList.push('Details');
menuList.push('Divider');
menuList.push('Open via Client');
return menuList;
@@ -111,7 +110,6 @@ class DirentRightMenu extends React.Component {
menuList.push('Comment');
}
menuList.push('History');
menuList.push('Details');
return menuList;
}
}
@@ -165,9 +163,6 @@ class DirentRightMenu extends React.Component {
case 'Delete':
translateResult = gettext('Delete');
break;
case 'Details':
translateResult = gettext('Details');
break;
case 'Unlock':
translateResult = gettext('Unlock');
break;

5
frontend/src/components/dirent-list-view/dirents-menu.js
View File

@@ -31,7 +31,7 @@ class DirentMenu extends React.Component {
if (dirent.type === 'dir') {
menuList = ['Share'];
} else if (dirent.type === 'file') {
menuList = ['Share', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
menuList = ['Share', 'Tags', 'Related Files', 'Divider', 'History', 'Divider', 'Open via Client'];
if (!Utils.isMarkdownFile(dirent.name)) {
menuList.splice(2, 1);
}
@@ -62,9 +62,6 @@ class DirentMenu extends React.Component {
case 'Tags':
translateResult = gettext('Tags');
break;
case 'Details':
translateResult = gettext('Details');
break;
case 'Lock':
translateResult = gettext('Lock');
break;