summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-09-11 08:43:48 +0200
committerGitHub <noreply@github.com>2020-09-11 08:43:48 +0200
commitfdeeeb7699dabc8f660d9c04a1437b08f4029636 (patch)
tree1e35dbaf019a7ffb68e68a7a0be89d1aa9405ac4 /apps/files
parenta3f4b6ba94893cdd448f05e5efc4935207d4c6e1 (diff)
parent525dfc7ae49cd34fb4a8c57fd28c511606762832 (diff)
downloadnextcloud-server-fdeeeb7699dabc8f660d9c04a1437b08f4029636.tar.gz
nextcloud-server-fdeeeb7699dabc8f660d9c04a1437b08f4029636.zip
Merge pull request #22592 from nextcloud/backport/22577/stable18
[stable18] Better error message when blocked by access control
Diffstat (limited to 'apps/files')
-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 f21de9a2069..60189da61fe 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'});
}