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

HUE-5304 [indexer] Displaying error message if any when listing collections

Romain Rigaux 8 жил өмнө
parent
commit
b829a89

+ 22 - 10
desktop/libs/indexer/src/indexer/templates/indexes.mako

@@ -414,12 +414,16 @@ ${ commonheader(_("Index Browser"), "search", user, request, "60px") | n,unicode
     self.fetchIndexes = function() {
     self.fetchIndexes = function() {
       $.post("${ url('indexer:list_indexes') }", {
       $.post("${ url('indexer:list_indexes') }", {
       }, function(data) {
       }, function(data) {
-        var indexes = []
-        data.collections.forEach(function(index) {
-          index.isSelected = false;
-          indexes.push(ko.mapping.fromJS(index));
-        });
-        self.indexes(indexes);
+        if (data.status == 0) {
+          var indexes = []
+          data.collections.forEach(function(index) {
+            index.isSelected = false;
+            indexes.push(ko.mapping.fromJS(index));
+          });
+          self.indexes(indexes);
+        } else {
+          $(document).trigger("error", data.message);
+        }
       }).fail(function (xhr, textStatus, errorThrown) {
       }).fail(function (xhr, textStatus, errorThrown) {
         $(document).trigger("error", xhr.responseText);
         $(document).trigger("error", xhr.responseText);
       });
       });
@@ -429,9 +433,13 @@ ${ commonheader(_("Index Browser"), "search", user, request, "60px") | n,unicode
       $.post("${ url('indexer:list_index') }", {
       $.post("${ url('indexer:list_index') }", {
         name: name
         name: name
       }, function(data) {
       }, function(data) {
-        self.index(new Index(self, data));
-        self.section('list-index');
-        self.tab('index-overview');
+        if (data.status == 0) {
+          self.index(new Index(self, data));
+          self.section('list-index');
+          self.tab('index-overview');
+        } else {
+          $(document).trigger("error", data.message);
+        }
       }).fail(function (xhr, textStatus, errorThrown) {
       }).fail(function (xhr, textStatus, errorThrown) {
         $(document).trigger("error", xhr.responseText);
         $(document).trigger("error", xhr.responseText);
       });
       });
@@ -441,7 +449,11 @@ ${ commonheader(_("Index Browser"), "search", user, request, "60px") | n,unicode
       $.post("${ url('indexer:delete_indexes') }", {
       $.post("${ url('indexer:delete_indexes') }", {
         "indexes": ko.mapping.toJSON(self.selectedIndexes)
         "indexes": ko.mapping.toJSON(self.selectedIndexes)
       }, function() {
       }, function() {
-        window.location.reload();
+        if (data.status == 0) {
+          window.location.reload();
+        } else {
+          $(document).trigger("error", data.message);
+        }
         $('#deleteIndex').modal('hide');
         $('#deleteIndex').modal('hide');
       }).fail(function (xhr, textStatus, errorThrown) {
       }).fail(function (xhr, textStatus, errorThrown) {
         $(document).trigger("error", xhr.responseText);
         $(document).trigger("error", xhr.responseText);

+ 0 - 1
desktop/libs/indexer/src/indexer/urls.py

@@ -48,7 +48,6 @@ urlpatterns += patterns('indexer.solr_api',
   url(r'^api/indexes/create/$', 'create_index', name='create_index'),
   url(r'^api/indexes/create/$', 'create_index', name='create_index'),
   url(r'^api/indexes/sample/$', 'sample_index', name='sample_index'),
   url(r'^api/indexes/sample/$', 'sample_index', name='sample_index'),
   url(r'^api/indexes/delete/$', 'delete_indexes', name='delete_indexes'),
   url(r'^api/indexes/delete/$', 'delete_indexes', name='delete_indexes'),
-  url(r'^api/indexes/(?P<index>\w+)/schema/$', 'design_schema', name='design_schema')
 )
 )
 
 
 urlpatterns += patterns('indexer.api3',
 urlpatterns += patterns('indexer.api3',