]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix handling of internal errors when uploading theming files 33798/head
authorDaniel Calviño Sánchez <danxuliu@gmail.com>
Sun, 24 Jul 2022 20:22:28 +0000 (22:22 +0200)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Thu, 1 Sep 2022 15:50:31 +0000 (15:50 +0000)
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>
apps/theming/js/settings-admin.js

index 335492fdae2eb6521030512f08fb301148cffd52..1bf2829aaefe6ae1362551a1da001422c3afae8a 100644 (file)
@@ -137,7 +137,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();
                }