From 9296efad91bcad6cf62fafc94604da88c8b42ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Fri, 5 Jan 2024 17:08:17 +0100 Subject: [PATCH] fix(files): use backend error message if provided MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/files/src/views/FilesList.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 8dce2fe469ce7..a3ef2c5f007fd 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')) },