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

Modify tips (#3236)

Browse Source 
* File move/copy feedback information improvement

* Add a prompt box when move/copy fails

* Encapsulated into a public function

* Modify some formats

* Add a semicolon

* modify movesuccessmessage function

* add semicolon
This commit is contained in:
zxj96
2019-04-11 11:07:31 +08:00
committed by Daniel Pan
parent 7a8ef5e0aa
commit b54bea4ecb
3 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,12 +455,10 @@ class LibContentView extends React.Component {
}
this.moveDirent(direntPath);
});
let message = gettext('Successfully moved %(name)s.');
message = message.replace('%(name)s', dirNames);
let message = Utils.getMoveSuccessMessage(dirNames);
toaster.success(message);
}).catch(() => {
let message = gettext('Failed to move %(name)s');
message = message.replace('%(name)s', dirNames);
let message = Utils.getMoveFailedMessage(dirNames);
toaster.danger(message);
});
}
@@ -479,12 +477,10 @@ class LibContentView extends React.Component {
this.copyTreeNode(direntPath, destDirentPath, destRepo, names[index]);
});
}
let message = gettext('Successfully copied %(name)s.');
message = message.replace('%(name)s', dirNames);
let message = Utils.getCopySuccessfulMessage(dirNames);
toaster.success(message);
}).catch(() => {
let message = gettext('Failed to copy %(name)s');
message = message.replace('%(name)s', dirNames);
let message = Utils.getCopyFailedMessage(dirNames);
toaster.danger(message);
});
}

12
frontend/src/repo-wiki-mode.js
View File

@@ -532,12 +532,10 @@ class Wiki extends Component {
this.moveTreeNode(direntPath, destDirentPath, destRepo, names[index]);
this.moveDirent(direntPath);
});
let message = gettext('Successfully moved %(name)s.');
message = message.replace('%(name)s', dirNames);
let message = Utils.getMoveSuccessMessage(dirNames);
toaster.success(message);
}).catch(() => {
let message = gettext('Failed to move %(name)s');
message = message.replace('%(name)s', dirNames);
let message = Utils.getMoveFailedMessage(dirNames);
toaster.danger(message);
});
}
@@ -553,12 +551,10 @@ class Wiki extends Component {
direntPaths.forEach((direntPath, index) => {
this.copyTreeNode(direntPath, destDirentPath, destRepo, names[index]);
});
let message = gettext('Successfully copied %(name)s.');
message = message.replace('%(name)s', dirNames);
let message = Utils.getCopySuccessfulMessage(dirNames);
toaster.success(message);
}).catch(() => {
let message = gettext('Failed to copy %(name)s');
message = message.replace('%(name)s', dirNames);
let message = Utils.getCopyFailedMessage(dirNames);
toaster.danger(message);
});
}

57
frontend/src/utils/utils.js
View File

@@ -744,4 +744,61 @@ export const Utils = {
return darkColor;
},
getCopySuccessfulMessage: function(dirNames) {
let message;
let dirNamesLength = dirNames.length;
if (dirNamesLength === 1) {
message = gettext('Successfully copied %(name)s.');
} else if (dirNamesLength === 2) {
message = gettext('Successfully copied %(name)s and 1 other item.');
} else {
message = gettext('Successfully copied %(name)s and %(amount)s other items.');
message = message.replace('%(amount)s', dirNamesLength - 1);
}
message = message.replace('%(name)s', dirNames[0]);
return message;
},
getMoveSuccessMessage: function(dirNames) {
let message;
let dirNamesLength = dirNames.length;
if (dirNamesLength === 1) {
message = gettext('Successfully moved %(name)s.');
} else if (dirNamesLength === 2) {
message = gettext('Successfully moved %(name)s and 1 other item.');
} else {
message = gettext('Successfully moved %(name)s and %(amount)s other items.');
message = message.replace('%(amount)s', dirNamesLength - 1);
}
message = message.replace('%(name)s', dirNames[0]);
return message;
},
getCopyFailedMessage: function(dirNames) {
let message;
let dirNamesLength = dirNames.length;
if (dirNamesLength > 1) {
message = gettext('Failed to copy %(name)s and %(amount)s other item(s).');
message = message.replace('%(amount)s', dirNamesLength - 1);
} else {
message = gettext('Failed to copy %(name)s.');
}
message = message.replace('%(name)s', dirNames[0]);
return message;
},
getMoveFailedMessage: function(dirNames) {
let message;
let dirNamesLength = dirNames.length;
if (dirNamesLength > 1) {
message = gettext('Failed to move %(name)s and %(amount)s other item(s).');
message = message.replace('%(amount)s', dirNamesLength - 1);
} else {
message = gettext('Failed to move %(name)s.');
}
message = message.replace('%(name)s', dirNames[0]);
return message;
},
};