Эх сурвалжийг харах

[spark] Basic assist.js error notification

Enrico Berti 11 жил өмнө
parent
commit
958e0c4cc5

+ 1 - 1
apps/spark/src/spark/templates/editor.mako

@@ -314,7 +314,7 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
   var assist = new Assist({
     app: "beeswax",
     user: "${user}",
-    failsQuietlyOn: [500], // error codes from beeswax/views.py - autocomplete
+    failsSilentlyOn: [500], // error codes from beeswax/views.py - autocomplete
     baseURL: "${url('beeswax:api_autocomplete_databases')}"
   });
 

+ 16 - 6
apps/spark/static/js/assist.js

@@ -63,15 +63,25 @@ var Assist = function (options) {
       type: "GET",
       url: _url + "?" + Math.random(),
       success: function (data) {
-        var _obj = {
-          data: data,
-          timestamp: (new Date()).getTime()
+        if (data.error){
+          if (typeof options.failsSilentlyOn == "undefined" || (data.code != null && options.failsSilentlyOn.indexOf(data.code) == -1)){
+            $.jHueNotify.error(data.error);
+          }
         }
-        $.totalStorage(_cachePath, _obj);
-        if (!_returnCached) {
-          options.onDataReceived($.totalStorage(_cachePath).data);
+        else {
+          var _obj = {
+            data: data,
+            timestamp: (new Date()).getTime()
+          }
+          $.totalStorage(_cachePath, _obj);
+          if (!_returnCached) {
+            options.onDataReceived($.totalStorage(_cachePath).data);
+          }
         }
       },
+      error: function (error) {
+        $(document).trigger('error', error);
+      },
       async: options.sync == "undefined"
     });