summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2022-07-24 22:22:28 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2022-07-24 22:22:28 +0200
commit393c89142179454d731931e85399685237f2a1bc (patch)
tree03406688a0212034834ea43f554b3c1f42d2147f
parent051518cd63cdbb9ff0a47deaacea65f6a0df0b06 (diff)
downloadnextcloud-server-393c89142179454d731931e85399685237f2a1bc.tar.gz
nextcloud-server-393c89142179454d731931e85399685237f2a1bc.zip
Fix handling of internal errors when uploading theming files
When a file can not be uploaded in the Theming app due to an expected error (like an invalid mime type) the response contains a "data.message" field. However, if the upload fails due to an unexpected error (like an internal error, for example if the "mime_content_type" function is disabled) there is no such field, so it should not be used. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--apps/theming/js/settings-admin.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 7efdab6dda4..0c18db1c9f4 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -127,7 +127,8 @@ window.addEventListener('DOMContentLoaded', function () {
},
fail: function (e, response){
var $form = $(e.target).closest('form');
- OC.msg.finishedError('#theming_settings_msg', response._response.jqXHR.responseJSON.data.message);
+ const responseJSON = response._response.jqXHR.responseJSON;
+ OC.msg.finishedError('#theming_settings_msg', responseJSON && responseJSON.data && responseJSON.data.message ? responseJSON.data.message : t('theming', 'Error uploading the file'));
$form.find('label.button').addClass('icon-upload').removeClass('icon-loading-small');
$('#theming_settings_loading').hide();
}