瀏覽代碼

HUE-2297 [impala] Assist databases might be duplicated

Removed double call to reset navigator on refresh click
Enrico Berti 11 年之前
父節點
當前提交
dabd7ba
共有 1 個文件被更改,包括 19 次插入18 次删除
  1. 19 18
      apps/beeswax/src/beeswax/templates/execute.mako

+ 19 - 18
apps/beeswax/src/beeswax/templates/execute.mako

@@ -1082,7 +1082,6 @@ $(document).ready(function () {
       getDatabases(function(){
         $.totalStorage(hac_getTotalStorageUserPrefix() + 'tables_' + _db, null);
         $.totalStorage(hac_getTotalStorageUserPrefix() + 'timestamp_tables_' + _db, null);
-        renderNavigator();
       });
     }
   }
@@ -1095,6 +1094,8 @@ $(document).ready(function () {
       $("#navigatorLoader").html("${_('No databases or tables found.')}");
     } else {
       hac_getTables(viewModel.database(), function (data) {  //preload tables for the default db
+        $("#navigatorTables").empty();
+        $("#navigatorLoader").show();
         $(data.split(" ")).each(function (cnt, table) {
           if ($.trim(table) != "") {
             var _table = $("<li>");
@@ -1222,7 +1223,21 @@ $(document).ready(function () {
     if ($(e.target).attr("href") == "#results" || $(e.target).attr("href") == "#recentTab") {
       reinitializeTableExtenders();
     }
+    if ($(e.target).attr("href") != "#results"){
+      $($(e.target).attr("href")).css('height', 'auto');
+      if ($(e.target).attr("href") == "#chart") {
+        logGA('results/chart');
+        predictGraph();
+      }
+      if ($(e.target).attr("href") == "#resultTab") {
+        reinitializeTable();
+      }
+    } else {
+      reinitializeTable();
+    }
+    return e;
   });
+
 });
 
 
@@ -1617,23 +1632,6 @@ $(document).ready(function () {
     resizeLogs();
   });
 
-  $(document).on("shown", "a[data-toggle='tab']:not(.sidetab)", function (e) {
-    if ($(e.target).attr("href") != "#results"){
-      $($(e.target).attr("href")).css('height', 'auto');
-      if ($(e.target).attr("href") == "#chart") {
-        logGA('results/chart');
-        predictGraph();
-      }
-      if ($(e.target).attr("href") == "#resultTab") {
-        reinitializeTable();
-      }
-    } else {
-      reinitializeTable();
-    }
-    return e;
-  });
-
-
   function getMapBounds(lats, lngs) {
     lats = lats.sort();
     lngs = lngs.sort();
@@ -1866,6 +1864,9 @@ function addResults(viewModel, dataTable, index, pageSize) {
   } else {
     dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(index, index + pageSize), index));
   }
+  if (index == 0){
+    window.setTimeout(reinitializeTable, 500);
+  }
 }
 
 function resultsTable(e, data) {