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

Merge pull request #3595 from haiwen/repaire_click_root

Browse Source 
Repaire click root
This commit is contained in:
Daniel Pan
2019-05-31 13:52:03 +08:00
committed by GitHub
parent ed28451ed7 ff916b71dd
commit 3899eb4530
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,12 +67,6 @@ class CopyDirent extends React.Component {
return; return;
} }
// copy dirents to current path
if (selectedPath && selectedPath === this.props.path && repo.repo_id === repoID) {
this.setState({errMessage: message});
return;
}
// copy dirents to one of their child. eg: A/B, A/D -> A/B/C // copy dirents to one of their child. eg: A/B, A/D -> A/B/C
let copyDirentPath = ''; let copyDirentPath = '';
let isChildPath = direntPaths.some(direntPath => { let isChildPath = direntPaths.some(direntPath => {

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

@@ -96,7 +96,8 @@ class MoveDirent extends React.Component {
} }
moveItem = () => { moveItem = () => {
let { repo, repoID, selectedPath } = this.state; let { repoID } = this.props;
let { repo, selectedPath } = this.state;
let direntPath = Utils.joinPath(this.props.path, this.props.dirent.name); let direntPath = Utils.joinPath(this.props.path, this.props.dirent.name);
let message = gettext('Invalid destination path'); let message = gettext('Invalid destination path');

2
frontend/src/components/file-chooser/repo-list-item.js
View File

@@ -130,7 +130,7 @@ class RepoListItem extends React.Component {
} }
onRepoItemClick = () => { onRepoItemClick = () => {
if (!this.isCurrentRepo()) { if (!this.isCurrentRepo() || this.props.selectedPath !== '') {
this.props.onRepoItemClick(this.props.repo); this.props.onRepoItemClick(this.props.repo);
} else { } else {
this.onToggleClick(); this.onToggleClick();

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

@@ -576,6 +576,9 @@ class LibContentView extends React.Component {
this.copyTreeNode(direntPath, destDirentPath, destRepo, names[index]); this.copyTreeNode(direntPath, destDirentPath, destRepo, names[index]);
}); });
} }
if (destDirentPath === this.state.path) {
this.loadDirentList(this.state.path);
}
let message = Utils.getCopySuccessfulMessage(dirNames); let message = Utils.getCopySuccessfulMessage(dirNames);
toaster.success(message); toaster.success(message);
}).catch(() => { }).catch(() => {
@@ -872,6 +875,9 @@ class LibContentView extends React.Component {
if (this.state.currentMode === 'column') { if (this.state.currentMode === 'column') {
this.copyTreeNode(direntPath, copyToDirentPath, destRepo, nodeName); this.copyTreeNode(direntPath, copyToDirentPath, destRepo, nodeName);
} }
if (copyToDirentPath === nodeParentPath) {
this.loadDirentList(this.state.path);
}
let message = gettext('Successfully copied %(name)s.'); let message = gettext('Successfully copied %(name)s.');
message = message.replace('%(name)s', dirName); message = message.replace('%(name)s', dirName);
toaster.success(message); toaster.success(message);