瀏覽代碼

[oozie] Convert to decision removes the join node

Enrico Berti 11 年之前
父節點
當前提交
a84efed

+ 0 - 4
apps/oozie/src/oozie/templates/editor/workflow_editor.mako

@@ -1008,10 +1008,6 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user) | n,unicode }
       <input type="text" data-bind="value: id" />
       <input type="text" data-bind="value: name" />
     </div>
-
-    <div>
-      <a class="pointer" data-bind="click: function() { $root.convertToFork($parent, $data) }">Convert to Fork</a>
-    </div>
   </div>
   <!-- /ko -->
 </script>

+ 6 - 0
apps/oozie/static/js/workflow-editor.ko.js

@@ -863,6 +863,12 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
 
   self.convertToDecision = function (widget, node) {
     if (widget.widgetType() == "fork-widget"){
+      var _row = self.getWidgetParentRow(widget.id());
+      var _next = self.getNextRow(_row);
+      while (_next.widgets().length == 0){
+        _next = self.getNextRow(_next);
+      }
+      self.removeWidgetById(_next.widgets()[0].id()); // remove the join
       widget.widgetType("decision-widget");
       node.type("decision-widget");
       var _newName = "decision-" + node.id().slice(0, 4);