Sfoglia il codice sorgente

HUE-1261 [beeswax] Query explain renders query Execute button useless after a page back

Fixed explain and execute button actions
Fixed problem with unsaved query and back button
Enrico Berti 12 anni fa
parent
commit
cf62f386c2

+ 2 - 0
apps/beeswax/src/beeswax/templates/execute.mako

@@ -521,6 +521,7 @@ ${layout.menubar(section='query')}
       % endif
 
       var executeQuery = function () {
+        $("input[name='button-explain']").remove();
         $("<input>").attr("type", "hidden").attr("name", "button-submit").attr("value", "Execute").appendTo($("#advancedSettingsForm"));
         checkAndSubmit();
       }
@@ -566,6 +567,7 @@ ${layout.menubar(section='query')}
       });
 
       $("#explainQuery").click(function () {
+        $("input[name='button-execute']").remove();
         $("<input>").attr("type", "hidden").attr("name", "button-explain").attr("value", "Explain").appendTo($("#advancedSettingsForm"));
         checkAndSubmit();
       });

+ 2 - 2
apps/beeswax/src/beeswax/templates/explain.mako

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 ${ commonheader(_('Query Explanation'), app_name, user, '100px') | n,unicode }
 ${layout.menubar(section='saved queries')}
 
-<div class="container-fluid">
+<div class="container-fluid" style="margin-bottom: 14px">
     <h1>${_('Query Explanation:')} ${util.render_query_context(query_context)}</h1>
 
     <ul class="nav nav-tabs">
@@ -43,7 +43,7 @@ ${layout.menubar(section='saved queries')}
     </div>
 
   <br/>
-  <a class="btn" onclick="history.back()">${ _('Back') }</a>
+  ${util.render_query_context(query_context, _('Back'), 'btn')}
 
 </div>
 

+ 4 - 4
apps/beeswax/src/beeswax/templates/util.mako

@@ -55,17 +55,17 @@ from django.utils.translation import ugettext as _
   % endfor
 </%def>
 
-<%def name="render_query_context(query_context)">
+<%def name="render_query_context(query_context, label=None, klass='')">
   % if query_context:
     % if query_context[0] == 'table':
       <% tablename, database = query_context[1].split(':') %>
-      <a href="${ url('metastore:describe_table', database, tablename) }">${tablename}</a>
+      <a href="${ url('metastore:describe_table', database, tablename) }" class="${ klass }">${ label or tablename }</a>
     % elif query_context[0] == 'design':
       <% design = query_context[1] %>
       % if design.is_auto:
-		<a href="${ url(app_name + ':execute_query', design.id)}">${_('Unsaved Query')}</a>
+		<a href="${ url(app_name + ':execute_query', design.id)}" class="${ klass }">${ label or _('Unsaved Query')}</a>
       % else:
-        <a href="${ url(app_name + ':execute_query', design.id)}">${design.name}</a>
+        <a href="${ url(app_name + ':execute_query', design.id)}" class="${ klass }">${ label or design.name}</a>
       % endif
     % else:
       ${_('Query Results')}