Bläddra i källkod

[beeswax] Send watch status when no error

Cleaned up error reporting a bit
Romain Rigaux 12 år sedan
förälder
incheckning
8cc288403f

+ 1 - 0
apps/beeswax/src/beeswax/api.py

@@ -167,6 +167,7 @@ def watch_query_refresh_json(request, id):
   job_urls = dict([(job, reverse('jobbrowser.views.single_job', kwargs={'job': job})) for job in jobs])
 
   result = {
+    'status': 0,
     'log': log,
     'jobs': jobs,
     'jobUrls': job_urls,

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

@@ -42,7 +42,7 @@ import beeswax.design
 import beeswax.management.commands.beeswax_install_examples
 
 from beeswax import common, data_export, models
-from beeswax.models import SavedQuery, make_query_context, QueryHistory
+from beeswax.models import SavedQuery, QueryHistory
 from beeswax.server import dbms
 from beeswax.server.dbms import expand_exception, get_query_server_config
 
@@ -444,7 +444,7 @@ def view_results(request, id, first_row=0):
 
   context = {
     'error': error,
-    'error_message': error_message,
+    'message': error_message,
     'query': query_history,
     'results': data,
     'columns': columns,

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

@@ -489,7 +489,7 @@ function BeeswaxViewModel(server) {
       dataType: 'json',
       type: 'POST',
       success: function(data) {
-        self.design.errors.removeAll();
+        self.resetErrors();
         if (data.status == 0) {
           self.design.results.url('/' + self.server() + '/results/' + data.id + '/0?format=json');
           self.design.watch.url(data.watch_url);
@@ -524,7 +524,7 @@ function BeeswaxViewModel(server) {
       dataType: 'json',
       type: 'POST',
       success: function(data) {
-        self.design.errors.removeAll();
+        self.resetErrors();
         self.design.watch.logs.removeAll();
         self.design.statement(data.statement);
         self.design.watch.url(data.watch_url);
@@ -616,7 +616,7 @@ function BeeswaxViewModel(server) {
 
   self.fetchResults = function() {
     $(document).trigger('fetch.results');
-    self.design.results.errors.removeAll();
+    self.resetErrors();
     var request = {
       url: self.design.results.url(),
       dataType: 'json',