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

repair encryption library move and copy bugs (#3082)

Browse Source
This commit is contained in:
zxj96
2019-03-08 17:38:28 +08:00
committed by Daniel Pan
parent 2fb1e9f866
commit e854970094
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +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,
}; };
// need dirent file Path； // need dirent file Path；
@@ -156,6 +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'
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>
@@ -164,7 +166,7 @@ class CopyDirent extends React.Component {
repoID={this.props.repoID} repoID={this.props.repoID}
onDirentItemClick={this.onDirentItemClick} onDirentItemClick={this.onDirentItemClick}
onRepoItemClick={this.onRepoItemClick} onRepoItemClick={this.onRepoItemClick}
mode="current_repo_and_other_repos" mode={mode}
/> />
{this.state.errMessage && <Alert color="danger" style={{margin: '0.5rem'}}>{this.state.errMessage}</Alert>} {this.state.errMessage && <Alert color="danger" style={{margin: '0.5rem'}}>{this.state.errMessage}</Alert>}
</ModalBody> </ModalBody>

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

@@ -14,6 +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,
}; };
// need dirent file Path； // need dirent file Path；
@@ -156,6 +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'
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>
@@ -164,7 +166,7 @@ class MoveDirent extends React.Component {
repoID={this.props.repoID} repoID={this.props.repoID}
onDirentItemClick={this.onDirentItemClick} onDirentItemClick={this.onDirentItemClick}
onRepoItemClick={this.onRepoItemClick} onRepoItemClick={this.onRepoItemClick}
mode="current_repo_and_other_repos" mode={mode}
/> />
{this.state.errMessage && <Alert color="danger" style={{margin: '0.5rem'}}>{this.state.errMessage}</Alert>} {this.state.errMessage && <Alert color="danger" style={{margin: '0.5rem'}}>{this.state.errMessage}</Alert>}
</ModalBody> </ModalBody>

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

@@ -429,6 +429,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}
/> />
</ModalPortal> </ModalPortal>
} }
@@ -441,6 +442,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}
/> />
</ModalPortal> </ModalPortal>
} }