浏览代码

[beeswax] Only close queries that are not running

Romain Rigaux 12 年之前
父节点
当前提交
7993f4d
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      apps/beeswax/static/js/beeswax.vm.js
  2. 1 1
      apps/oozie/src/oozie/tests.py

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

@@ -708,7 +708,7 @@ function BeeswaxViewModel(server) {
 
   self.closeQuery = function() {
     var self = this;
-    if (self.design.history.id()) {
+    if (self.design.history.id() && !self.design.isRunning()) {
       var data = {};
       var url = '/' + self.server() + '/api/query/' + self.design.history.id() + '/close';
       var request = {

+ 1 - 1
apps/oozie/src/oozie/tests.py

@@ -798,7 +798,7 @@ class TestEditor(OozieMockBase):
         {'key': 'enabled', 'value': True},
         {'key': 'nominal-time', 'value': '${time}'},]}
     )
-    assert_equal([{'name': u'time', 'value': u''}, {'name': u'output', 'value': u''}, {'name': u'SLEEP', 'value': ''}, {'name': u'market', 'value': u'US'}],
+    assert_equal([{'name': u'output', 'value': u''}, {'name': u'SLEEP', 'value': ''}, {'name': u'market', 'value': u'US'}, {'name': u'time', 'value': u''}],
                  self.wf.find_all_parameters())