haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-18 15:08:22 +00:00
Code Issues Releases Wiki Activity

repair move&copy bug (#3091)

Browse Source
This commit is contained in:
杨顺强 2019-03-11 11:14:49 +08:00 committed by Daniel Pan
parent d0ad828267
commit 0a5bffc45f
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/dialog/copy-dirent-dialog.js
View File

@ -14,7 +14,7 @@ const propTypes = {
onItemCopy: PropTypes.func, onItemCopy: PropTypes.func,
onItemsCopy: PropTypes.func, onItemsCopy: PropTypes.func,
onCancelCopy: PropTypes.func.isRequired, onCancelCopy: PropTypes.func.isRequired,
currentRepoInfo:PropTypes.object.isRequired, repoEncrypted: PropTypes.object.isRequired,
}; };
// need dirent file Path； // need dirent file Path；
@ -157,7 +157,7 @@ class CopyDirent extends React.Component {
} else { } else {
title = gettext('Copy selected item(s) to:'); title = gettext('Copy selected item(s) to:');
} }
let mode = this.props.currentRepoInfo.encrypted ? 'only_current_library':'current_repo_and_other_repos' let mode = this.props.repoEncrypted ? 'only_current_library':'current_repo_and_other_repos'
return ( return (
<Modal isOpen={true} toggle={this.toggle}> <Modal isOpen={true} toggle={this.toggle}>
<ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader> <ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader>

4
frontend/src/components/dialog/move-dirent-dialog.js
View File

@ -14,7 +14,7 @@ const propTypes = {
onItemMove: PropTypes.func, onItemMove: PropTypes.func,
onItemsMove: PropTypes.func, onItemsMove: PropTypes.func,
onCancelMove: PropTypes.func.isRequired, onCancelMove: PropTypes.func.isRequired,
currentRepoInfo:PropTypes.object.isRequired, repoEncrypted: PropTypes.object.isRequired,
}; };
// need dirent file Path； // need dirent file Path；
@ -157,7 +157,7 @@ class MoveDirent extends React.Component {
} else { } else {
title = gettext('Move selected item(s) to:'); title = gettext('Move selected item(s) to:');
} }
let mode = this.props.currentRepoInfo.encrypted ? 'only_current_library':'current_repo_and_other_repos' let mode = this.props.repoEncrypted ? 'only_current_library':'current_repo_and_other_repos'
return ( return (
<Modal isOpen={true} toggle={this.toggle}> <Modal isOpen={true} toggle={this.toggle}>
<ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader> <ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader>

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

@ -33,8 +33,12 @@ const propTypes = {
onItemDetails: PropTypes.func.isRequired, onItemDetails: PropTypes.func.isRequired,
onDirentClick: PropTypes.func.isRequired, onDirentClick: PropTypes.func.isRequired,
updateDirent: PropTypes.func.isRequired, updateDirent: PropTypes.func.isRequired,
showImagePopup: PropTypes.func.isRequired,
currentRepoInfo: PropTypes.object, currentRepoInfo: PropTypes.object,
isRepoOwner: PropTypes.bool, isRepoOwner: PropTypes.bool,
isAdmin: PropTypes.bool.isRequired,
repoEncrypted: PropTypes.bool.isRequired,
isGroupOwnedRepo: PropTypes.bool.isRequired,
}; };
class DirentListItem extends React.Component { class DirentListItem extends React.Component {
@ -429,7 +433,7 @@ class DirentListItem extends React.Component {
isMutipleOperation={this.state.isMutipleOperation} isMutipleOperation={this.state.isMutipleOperation}
onItemMove={this.props.onItemMove} onItemMove={this.props.onItemMove}
onCancelMove={this.onItemMoveToggle} onCancelMove={this.onItemMoveToggle}
currentRepoInfo={this.props.currentRepoInfo} repoEncrypted={this.props.repoEncrypted}
/> />
</ModalPortal> </ModalPortal>
} }
@ -442,7 +446,7 @@ class DirentListItem extends React.Component {
isMutipleOperation={this.state.isMutipleOperation} isMutipleOperation={this.state.isMutipleOperation}
onItemCopy={this.props.onItemCopy} onItemCopy={this.props.onItemCopy}
onCancelCopy={this.onItemCopyToggle} onCancelCopy={this.onItemCopyToggle}
currentRepoInfo={this.props.currentRepoInfo} repoEncrypted={this.props.repoEncrypted}
/> />
</ModalPortal> </ModalPortal>
} }

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

@ -12,6 +12,7 @@ import CopyDirentDialog from '../dialog/copy-dirent-dialog';
const propTypes = { const propTypes = {
path: PropTypes.string.isRequired, path: PropTypes.string.isRequired,
repoID: PropTypes.string.isRequired, repoID: PropTypes.string.isRequired,
repoEncrypted: PropTypes.bool.isRequired,
selectedDirentList: PropTypes.array.isRequired, selectedDirentList: PropTypes.array.isRequired,
onItemsMove: PropTypes.func.isRequired, onItemsMove: PropTypes.func.isRequired,
onItemsCopy: PropTypes.func.isRequired, onItemsCopy: PropTypes.func.isRequired,
@ -106,6 +107,7 @@ class MutipleDirOperationToolbar extends React.Component {
<MoveDirentDialog <MoveDirentDialog
path={this.props.path} path={this.props.path}
repoID={this.props.repoID} repoID={this.props.repoID}
repoEncrypted={this.props.repoEncrypted}
isMutipleOperation={this.state.isMutipleOperation} isMutipleOperation={this.state.isMutipleOperation}
selectedDirentList={this.props.selectedDirentList} selectedDirentList={this.props.selectedDirentList}
onItemsMove={this.props.onItemsMove} onItemsMove={this.props.onItemsMove}
@ -116,6 +118,7 @@ class MutipleDirOperationToolbar extends React.Component {
<CopyDirentDialog <CopyDirentDialog
path={this.props.path} path={this.props.path}
repoID={this.props.repoID} repoID={this.props.repoID}
repoEncrypted={this.props.repoEncrypted}
selectedDirentList={this.props.selectedDirentList} selectedDirentList={this.props.selectedDirentList}
isMutipleOperation={this.state.isMutipleOperation} isMutipleOperation={this.state.isMutipleOperation}
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}

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

@ -107,6 +107,7 @@ class LibContentToolbar extends React.Component {
<MutipleDirOperationToolbar <MutipleDirOperationToolbar
repoID={this.props.repoID} repoID={this.props.repoID}
path={this.props.path} path={this.props.path}
repoEncrypted={this.props.repoEncrypted}
selectedDirentList={this.props.selectedDirentList} selectedDirentList={this.props.selectedDirentList}
onItemsMove={this.props.onItemsMove} onItemsMove={this.props.onItemsMove}
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}