Merge pull request #22577 from nextcloud/bugfix/noid/better-error-when-chunk-assembling-is-denied

nickvergessen · web-flow · commit 3c62767873c4 · 2020-09-04T15:50:11.000+02:00
Better error message when blocked by access control
diff --git 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'});
 						}

Original file line number	Diff line number	Diff line change
`@@ -1303,6 +1303,8 @@ OC.Uploader.prototype = _.extend({`
`1303`	`1303`	`self.cancelUploads();`
`1304`	`1304`	`} else if (status === 409) {`
`1305`	`1305`	`OC.Notification.show(message \|\| t('files', 'Target folder does not exist any more'), {type: 'error'});`
	`1306`	`+ } else if (status === 403) {`
	`1307`	`+ OC.Notification.show(message \|\| t('files', 'Operation is blocked by access control'), {type: 'error'});`
`1306`	`1308`	`} else {`
`1307`	`1309`	`OC.Notification.show(message \|\| t('files', 'Error when assembling chunks, status code {status}', {status: status}), {type: 'error'});`
`1308`	`1310`	`}`