aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@protonmail.com>2024-01-05 17:08:17 +0100
committerJohn Molakvoæ <skjnldsv@protonmail.com>2024-01-12 10:10:27 +0100
commit90d50323d8a5c5808f238a76bc2f11f9b82493c0 (patch)
tree4a3fdb987201f8ddde8cccceb223f2c43e2bfe5d /apps
parent3463ed538c327cab4767f8af58cf28ef1133370b (diff)
downloadnextcloud-server-90d50323d8a5c5808f238a76bc2f11f9b82493c0.tar.gz
nextcloud-server-90d50323d8a5c5808f238a76bc2f11f9b82493c0.zip
fix(files): use backend error message if provided
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files/src/views/FilesList.vue11
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index 8dce2fe469c..a3ef2c5f007 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -541,9 +541,6 @@ export default defineComponent({
} else if (status === 403) {
showError(this.t('files', 'Operation is blocked by access control'))
return
- } else if (status !== 0) {
- showError(this.t('files', 'Error when assembling chunks, status code {status}', { status }))
- return
}
// Else we try to parse the response error message
@@ -552,12 +549,18 @@ export default defineComponent({
const response = await parser.parseStringPromise(upload.response?.data)
const message = response['s:message'][0] as string
if (typeof message === 'string' && message.trim() !== '') {
- // Unfortunatly, the server message is not translated
+ // The server message is also translated
showError(this.t('files', 'Error during upload: {message}', { message }))
return
}
} catch (error) {}
+ // Finally, check the status code if we have one
+ if (status !== 0) {
+ showError(this.t('files', 'Error during upload, status code {status}', { status }))
+ return
+ }
+
showError(this.t('files', 'Unknown error during upload'))
},