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

optimization code

Browse Source
This commit is contained in:
zxj96
2019-04-25 18:28:52 +08:00
parent 2c83d6882c
commit b79894cb72
4 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,18 +413,7 @@ class DirentListItem extends React.Component {
return ''; return '';
} }
let isShowShareBtn = false; let isShowShareBtn = (dirent.type === 'dir' && this.props.isShowShareBtn) || canGenerateShareLink;
if (this.props.showShareBtn) {
if (canGenerateShareLink) {
isShowShareBtn = true;
} else {
if (dirent.type === 'dir') {
isShowShareBtn = true;
} else {
isShowShareBtn = false;
}
}
}
return ( return (
<Fragment> <Fragment>

7
frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
View File

@@ -32,6 +32,7 @@ const propTypes = {
onFilesTagChanged: PropTypes.func.isRequired, onFilesTagChanged: PropTypes.func.isRequired,
unSelectDirent: PropTypes.func.isRequired, unSelectDirent: PropTypes.func.isRequired,
updateDirent: PropTypes.func.isRequired, updateDirent: PropTypes.func.isRequired,
showShareBtn: PropTypes.bool.isRequired,
}; };
class MutipleDirOperationToolbar extends React.Component { class MutipleDirOperationToolbar extends React.Component {
@@ -92,17 +93,15 @@ class MutipleDirOperationToolbar extends React.Component {
const { SHARE, TAGS, RELATED_FILES, HISTORY, OPEN_VIA_CLIENT, LOCK, UNLOCK } = TextTranslation; const { SHARE, TAGS, RELATED_FILES, HISTORY, OPEN_VIA_CLIENT, LOCK, UNLOCK } = TextTranslation;
let shareBtn = currentRepoInfo.encrypted ? [] : [SHARE];
if (dirent.type === 'dir') { if (dirent.type === 'dir') {
let shareBtn = this.props.showShareBtn ? [SHARE] : []
menuList = [...shareBtn]; menuList = [...shareBtn];
return menuList; return menuList;
} }
if (dirent.type === 'file') { if (dirent.type === 'file') {
if (!currentRepoInfo.encrypted) { let shareBtn = (this.props.showShareBtn && canGenerateShareLink) ? [SHARE] : [];
shareBtn = canGenerateShareLink ? [SHARE] : [];
}
menuList = [...shareBtn, TAGS, RELATED_FILES, 'Divider', HISTORY, 'Divider', OPEN_VIA_CLIENT]; menuList = [...shareBtn, TAGS, RELATED_FILES, 'Divider', HISTORY, 'Divider', OPEN_VIA_CLIENT];
if (!Utils.isMarkdownFile(dirent.name)) { if (!Utils.isMarkdownFile(dirent.name)) {

3
frontend/src/components/toolbar/view-file-toolbar.js
View File

@@ -23,6 +23,7 @@ const propTypes = {
relatedFiles: PropTypes.array.isRequired, relatedFiles: PropTypes.array.isRequired,
onFileTagChanged: PropTypes.func.isRequired, onFileTagChanged: PropTypes.func.isRequired,
onRelatedFileChange: PropTypes.func.isRequired, onRelatedFileChange: PropTypes.func.isRequired,
showShareBtn: PropTypes.bool.isRequired,
}; };
class ViewFileToolbar extends React.Component { class ViewFileToolbar extends React.Component {
@@ -108,7 +109,7 @@ class ViewFileToolbar extends React.Component {
{gettext('More')} {gettext('More')}
</DropdownToggle> </DropdownToggle>
<DropdownMenu> <DropdownMenu>
{canGenerateShareLink && {this.props.showShareBtn && canGenerateShareLink &&
<DropdownItem onClick={this.onShareToggle}>{gettext('Share')}</DropdownItem> <DropdownItem onClick={this.onShareToggle}>{gettext('Share')}</DropdownItem>
} }
<DropdownItem onClick={this.onEditFileTagToggle}>{gettext('Tags')}</DropdownItem> <DropdownItem onClick={this.onEditFileTagToggle}>{gettext('Tags')}</DropdownItem>

2
frontend/src/pages/lib-content-view/lib-content-toolbar.js
View File

@@ -71,6 +71,7 @@ class LibContentToolbar extends React.Component {
relatedFiles={this.props.relatedFiles} relatedFiles={this.props.relatedFiles}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
onRelatedFileChange={this.props.onRelatedFileChange} onRelatedFileChange={this.props.onRelatedFileChange}
showShareBtn={this.props.showShareBtn}
/> />
<ViewModeToolbar currentMode={this.props.currentMode} switchViewMode={this.props.switchViewMode}/> <ViewModeToolbar currentMode={this.props.currentMode} switchViewMode={this.props.switchViewMode}/>
</div> </div>
@@ -101,6 +102,7 @@ class LibContentToolbar extends React.Component {
relatedFiles={this.props.relatedFiles} relatedFiles={this.props.relatedFiles}
unSelectDirent={this.props.unSelectDirent} unSelectDirent={this.props.unSelectDirent}
onFilesTagChanged={this.props.onFilesTagChanged} onFilesTagChanged={this.props.onFilesTagChanged}
showShareBtn={this.props.showShareBtn}
/> : /> :
<DirOperationToolBar <DirOperationToolBar
path={this.props.path} path={this.props.path}