Przeglądaj źródła

[beeswax] Remove dbquery app dependency

Also fix column tests
Romain Rigaux 12 lat temu
rodzic
commit
89e92a6

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

@@ -208,7 +208,7 @@ ${layout.menubar(section='query')}
             </thead>
             <tbody>
               % for col in columns:
-                <tr><td><a href="javascript:void(0)" class="column-selector" data-column="${col}">${ col.name }</a></td></tr>
+                <tr><td><a href="javascript:void(0)" class="column-selector" data-column="${ col.name }">${ col.name }</a></td></tr>
               % endfor
             </tbody>
           </table>

+ 1 - 2
apps/beeswax/src/beeswax/views.py

@@ -48,8 +48,6 @@ from beeswax.models import SavedQuery, make_query_context, QueryHistory
 from beeswax.server import dbms
 from beeswax.server.dbms import expand_exception, get_query_server_config, QueryServerException
 
-import rdbms.design
-
 from thrift.transport.TTransport import TTransportException
 
 
@@ -668,6 +666,7 @@ def view_results(request, id, first_row=0):
     'error_message': error_message,
     'query': query_history,
     'results': data,
+    'columns': columns,
     'expected_first_row': first_row,
     'log': log,
     'hadoop_jobs': app_name != 'impala' and _parse_out_hadoop_jobs(log),