Просмотр исходного кода

[spark] Set to failed status when session creation failed

Romain Rigaux 10 лет назад
Родитель
Сommit
7bfe03c
2 измененных файлов с 8 добавлено и 4 удалено
  1. 1 1
      apps/spark/src/spark/templates/editor.mako
  2. 7 3
      apps/spark/static/js/spark.ko.js

+ 1 - 1
apps/spark/src/spark/templates/editor.mako

@@ -338,7 +338,7 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
             <textarea data-bind="value: statement_raw, codemirror: { 'id': id(), 'viewportMargin': Infinity, 'lineNumbers': true, 'matchBrackets': true, 'mode': editorMode(), 'enter': execute }">
             </textarea>
             <span data-bind="visible: status() == 'loading'" class="codeMirror-overlaybtn pointer">
-              <i class='fa fa-spinner fa-spin fa-2x'></i>
+              <i class='fa fa-spinner fa-spin fa-2x'></i> ${ _('Creating session') }
             </span>
             <a title="${ _('CTRL + ENTER') }" data-bind="click: execute, visible: status() != 'running' && status() != 'loading'" class="btn codeMirror-overlaybtn pointer">
               ${ _('Go!') }

+ 7 - 3
apps/spark/static/js/spark.ko.js

@@ -33,9 +33,7 @@ var Result = function (snippet, result) {
   self.endTime = ko.observable(typeof result.endTime != "undefined" && result.endTime != null ? new Date(result.endTime) : new Date());
   self.executionTime = ko.computed(function() {
     return self.endTime().getTime() - self.startTime().getTime();
-  });
-  self.type = ko.observable(typeof result.type != "undefined" && result.type != null ? result.type : 'plain');
-  
+  });  
   
   function isNumericColumn(type) {
     return $.inArray(type, ['TINYINT_TYPE', 'SMALLINT_TYPE', 'INT_TYPE', 'BIGINT_TYPE', 'FLOAT_TYPE', 'DOUBLE_TYPE', 'DECIMAL_TYPE', 'TIMESTAMP_TYPE', 'DATE_TYPE']) > -1;
@@ -289,6 +287,7 @@ var Snippet = function (vm, notebook, snippet) {
 	      self.status('ready');
 	    }
 	    else {
+	      self.status('failed');
 	      $(document).trigger("error", data.message);
 	    }
 	}).fail(function (xhr, textStatus, errorThrown) {
@@ -482,6 +481,11 @@ var Snippet = function (vm, notebook, snippet) {
   self.init = function() {
 	if (self.status() == 'running') {
 	  self.checkStatus();
+	}
+	
+	if (self.status() == 'loading') {
+	  self.status('failed');
+	  self.progress(0);
 	} 
 	
 	if (self.status() != 'loading' && self.status() != 'ready') {