소스 검색

HUE-1881 [impala] Close query on unload page

Abraham Elmahrek 12 년 전
부모
커밋
f24d18bad0
2개의 변경된 파일32개의 추가작업 그리고 32개의 파일을 삭제
  1. 31 31
      apps/beeswax/src/beeswax/templates/execute.mako
  2. 1 1
      apps/beeswax/static/js/beeswax.vm.js

+ 31 - 31
apps/beeswax/src/beeswax/templates/execute.mako

@@ -1726,44 +1726,44 @@ $(document).ready(function () {
   updateSidebarTooltips(".filesField");
   updateSidebarTooltips(".functionsField");
   updateSidebarTooltips(".classNamesField");
+});
 
-  % if app_name == 'impala':
-    $("#downloadQuery").click(function () {
-      $("<input>").attr("type", "hidden").attr("name", "button-submit").attr("value", "Execute").appendTo($("#advancedSettingsForm"));
-      $("<input>").attr("type", "hidden").attr("name", "download").attr("value", "true").appendTo($("#advancedSettingsForm"));
-      tryExecuteQuery();
-    });
-  % endif
-
-  % if app_name == 'impala':
-    $("#refresh-dyk").popover({
-      'title': "${_('Missing some tables? In order to update the list of tables/metadata seen by Impala, execute one of these queries:')}",
-      'content': $("#refresh-content").html(),
-      'trigger': 'hover',
-      'html': true
-    });
+% if app_name == 'impala':
+$(document).ready(function () {
+  $("#downloadQuery").click(function () {
+    $("<input>").attr("type", "hidden").attr("name", "button-submit").attr("value", "Execute").appendTo($("#advancedSettingsForm"));
+    $("<input>").attr("type", "hidden").attr("name", "download").attr("value", "true").appendTo($("#advancedSettingsForm"));
+    tryExecuteQuery();
+  });
 
-    $("#refresh-tip").popover({
-      'title': "${_('Missing some tables? In order to update the list of tables/metadata seen by Impala, execute one of these queries:')}",
-      'content': $("#refresh-content").html(),
-      'trigger': 'hover',
-      'html': true
-    });
+  $("#refresh-dyk").popover({
+    'title': "${_('Missing some tables? In order to update the list of tables/metadata seen by Impala, execute one of these queries:')}",
+    'content': $("#refresh-content").html(),
+    'trigger': 'hover',
+    'html': true
+  });
 
-    window.onbeforeunload = function(e) {
-      viewModel.closeQuery();
-    };
+  $("#refresh-tip").popover({
+    'title': "${_('Missing some tables? In order to update the list of tables/metadata seen by Impala, execute one of these queries:')}",
+    'content': $("#refresh-content").html(),
+    'trigger': 'hover',
+    'html': true
+  });
 
-    $(document).on('explain.query', function() {
-      viewModel.closeQuery();
-    });
+  $(document).on('explain.query', function() {
+    viewModel.closeQuery();
+  });
 
-    $(document).on('execute.query', function() {
-      viewModel.closeQuery();
-    });
-  % endif
+  $(document).on('execute.query', function() {
+    viewModel.closeQuery();
+  });
 });
 
+window.onbeforeunload = function(e) {
+  viewModel.closeQuery();
+};
+% endif
+
 $(".pathChooser:not(:has(~ button))").after(getFileAndFolderBrowseButton($(".pathChooser:not(:has(~ button))"), true));
 
 

+ 1 - 1
apps/beeswax/static/js/beeswax.vm.js

@@ -700,7 +700,7 @@ function BeeswaxViewModel(server) {
 
   self.closeQuery = function() {
     var self = this;
-    if (self.design.id()) {
+    if (self.design.history.id()) {
       var data = {};
       var url = '/' + self.server() + '/api/query/' + self.design.history.id() + '/close';
       var request = {