瀏覽代碼

HUE-1048 [impala] My query page broken when no saved query

Romain Rigaux 13 年之前
父節點
當前提交
73e0d7323b

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -107,7 +107,7 @@ ${ layout.menubar(section='history') }
               %>
               <tr class="histRow">
                 <td data-sort-value="${time.mktime(query.submission_date.timetuple())}">${query.submission_date.strftime("%x %X")}</td>
-                <td>${show_saved_query(design, query)}</td>
+                <td>${show_saved_query(query.design, query)}</td>
                 <td>
                   <p>
                     % if len(query.query) > 100:

+ 3 - 3
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -120,14 +120,14 @@ ${layout.menubar(section='my queries')}
           <tr>
             <td width="1%" data-row-selector-exclude="true">
               <div class="hueCheckbox runCheck"
-                data-edit-url="${ url(app_name + ':execute_query', design_id=design.id) }"
+                data-edit-url="${ url(app_name + ':execute_query', design_id=query.design.id) }"
                 % if qcontext and query.last_state != models.QueryHistory.STATE.expired.index:
                   data-view-url="${ url(app_name + ':watch_query', id=query.id) }?context=${qcontext|u}"
                 % endif
                 data-row-selector-exclude="true"></div>
             </td>
-            <td width="10%" data-sort-value="${time.mktime(query.submission_date.timetuple())}">${query.submission_date.strftime("%x %X")}</td>
-            <td width="20%"><a href="${ url(app_name + ':execute_query', design_id=design.id) }" data-row-selector="true">${design.name}</a></td>
+            <td width="10%" data-sort-value="${time.mktime(query.submission_date.timetuple())}">${ query.submission_date.strftime("%x %X") }</td>
+            <td width="20%"><a href="${ url(app_name + ':execute_query', design_id=query.design.id) }" data-row-selector="true">${ query.design.name }</a></td>
             <td width="60%">
               % if len(query.query) > 100:
               <code>${collapse_whitespace(query.query[:100])}...</code>

+ 8 - 1
apps/impala/src/impala/tests.py

@@ -21,7 +21,7 @@ from nose.tools import assert_true, assert_equal, assert_false
 from django.contrib.auth.models import User
 
 from desktop.lib.django_test_util import make_logged_in_client
-from beeswax.models import SavedQuery
+from beeswax.models import SavedQuery, QueryHistory
 from beeswax.server import dbms
 
 
@@ -63,6 +63,13 @@ class TestImpala:
       impala_query = create_saved_query('impala', user)
       response = self.client.get("/impala/list_designs")
       assert_equal(len(response.context['page'].object_list), 1)
+
+      # Test my query page
+      QueryHistory.objects.create(owner=user, design=impala_query, query='', last_state=QueryHistory.STATE.available.index)
+
+      resp = self.client.get('/impala/my_queries')
+      assert_equal(len(resp.context['q_page'].object_list), 1)
+      assert_equal(len(resp.context['h_page'].object_list), 1)
     finally:
       if beewax_query is not None:
         beewax_query.delete()

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -58,7 +58,7 @@ ${layout.menubar(section='dashboard')}
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
-          <th width="105%">${ _('Next submission') }</th>
+          <th width="15%">${ _('Next submission') }</th>
           <th width="10%">${ _('Status') }</th>
           <th width="25%">${ _('Name') }</th>
           <th width="10%">${ _('Progress') }</th>