aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2020-09-04 15:50:11 +0200
committerGitHub <noreply@github.com>2020-09-04 15:50:11 +0200
commit3c62767873c4bf5d0770bf3af2129f50cbdcfe2f (patch)
tree3c73f04a97b05614f568b4464e5b8e104727dab6
parent24d1d93d9f926280a636291c03cd56c7fec5417f (diff)
parent3fb6a625aac16dd479a2d6e9a77d2fea2efff6ff (diff)
downloadnextcloud-server-3c62767873c4bf5d0770bf3af2129f50cbdcfe2f.tar.gz
nextcloud-server-3c62767873c4bf5d0770bf3af2129f50cbdcfe2f.zip
Merge pull request #22577 from nextcloud/bugfix/noid/better-error-when-chunk-assembling-is-denied
Better error message when blocked by access control
-rw-r--r--apps/files/js/file-upload.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 1e54d32e55f..691131293a8 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1303,6 +1303,8 @@ OC.Uploader.prototype = _.extend({
self.cancelUploads();
} else if (status === 409) {
OC.Notification.show(message || t('files', 'Target folder does not exist any more'), {type: 'error'});
+ } else if (status === 403) {
+ OC.Notification.show(message || t('files', 'Operation is blocked by access control'), {type: 'error'});
} else {
OC.Notification.show(message || t('files', 'Error when assembling chunks, status code {status}', {status: status}), {type: 'error'});
}