Преглед на файлове

[ui-fb] Improve error handling in FileBrowserModel by extracting detailed error messages from JSON responses

Harsh Gupta преди 1 месец
родител
ревизия
5c102db670
променени са 1 файла, в които са добавени 10 реда и са изтрити 2 реда
  1. 10 2
      desktop/core/src/desktop/static/desktop/js/listdir-inline.js

+ 10 - 2
desktop/core/src/desktop/static/desktop/js/listdir-inline.js

@@ -1242,7 +1242,11 @@ var FileBrowserModel = function (files, page, breadcrumbs, currentDirPath) {
         self.retrieveData(true);
       },
       error: function (xhr, textStatus, errorThrown) {
-        huePubSub.publish('hue.global.error', {message: xhr.responseText});
+        var errorMessage = xhr.responseText;
+        if (xhr.responseJSON && xhr.responseJSON.detail) {
+          errorMessage = xhr.responseJSON.detail;
+        }
+        huePubSub.publish('hue.global.error', {message: errorMessage});
         resetPrimaryButtonsStatus();
       }
     });
@@ -1273,7 +1277,11 @@ var FileBrowserModel = function (files, page, breadcrumbs, currentDirPath) {
         self.retrieveData(true);
       },
       error: function (xhr, textStatus, errorThrown) {
-        huePubSub.publish('hue.global.error', {message: xhr.responseText});
+        var errorMessage = xhr.responseText;
+        if (xhr.responseJSON && xhr.responseJSON.detail) {
+          errorMessage = xhr.responseJSON.detail;
+        }
+        huePubSub.publish('hue.global.error', {message: errorMessage});
         resetPrimaryButtonsStatus();
       }
     });