1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 07:08:55 +00:00

[upload link] bugfix & improvements for notifications

This commit is contained in:
llj
2021-09-15 14:53:00 +08:00
parent 2890e6adde
commit bce135d811

View File

@@ -302,8 +302,8 @@ class FileUploader extends React.Component {
// start uploading // start uploading
onUploadStart = () => { onUploadStart = () => {
const message = gettext('File upload started.'); const message = gettext('File upload started');
toaster.info(message); toaster.notify(message);
} }
onProgress = () => { onProgress = () => {
@@ -418,12 +418,14 @@ class FileUploader extends React.Component {
retryFileList: this.state.retryFileList, retryFileList: this.state.retryFileList,
uploadFileList: uploadFileList uploadFileList: uploadFileList
}); });
} }
onComplete = () => { onComplete = () => {
const message = gettext('All files uploaded'); if (!this.error) {
toaster.success(message); const message = gettext('All files uploaded');
toaster.success(message);
}
this.error = false; // reset it
this.notifiedFolders = []; this.notifiedFolders = [];
// reset upload link loaded // reset upload link loaded
@@ -431,9 +433,14 @@ class FileUploader extends React.Component {
this.setState({allFilesUploaded: true}); this.setState({allFilesUploaded: true});
} }
onError = (message) => { onError = (message, file) => {
const msg = gettext('Error'); let msg = gettext('Error');
if (file && file.fileName) {
msg = gettext('Failed to upload {file_name}.')
.replace('{file_name}', file.fileName);
}
toaster.danger(msg); toaster.danger(msg);
this.error = true;
// reset upload link loaded // reset upload link loaded
this.isUploadLinkLoaded = false; this.isUploadLinkLoaded = false;