فهرست منبع

AMBARI-20134. Improper action node name after importing the asset (Venkata Sairam via pallavkul)

pallavkul 8 سال پیش
والد
کامیت
bb568139d6

+ 3 - 2
contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js

@@ -449,7 +449,8 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
     this.createSnapshot();
     var transition = this.get("currentTransition").source.transitions.findBy('targetNode.id',currentTransition.targetNode.id);
     transition.source=this.get("currentTransition").source;
-    var actionNode = this.get("workflow").addNode(transition,actionNodeType);
+    this.generateUniqueNodeId(actionNodeType);
+    var actionNode = this.get("workflow").addNode(transition,actionNodeType, {}, "");
     this.rerender();
     this.doValidation();
     this.scrollToNewPosition();
@@ -724,7 +725,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
     this.set("configForSave", {json : workflowJson, xml : workflowXml,isDraft : isDraft});
     this.set("showingSaveWorkflow",true);
   },
-  openJobConfig (){
+  openJobConfig () {
     this.get('workflowContext').clearErrors();
     var workflowGenerator=WorkflowGenerator.create({workflow:this.get("workflow"),
     workflowContext:this.get('workflowContext')});

+ 3 - 1
contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow.js

@@ -141,7 +141,9 @@ var Workflow= Ember.Object.extend(FindNodeMixin,{
       computedTarget=target.getTargets()[0];
     }
     var generatedNode=this.generatedNode(computedTarget,type,settings);
-    generatedNode.name = generatedNode.name+ "_"+ id;
+    if(id){
+      generatedNode.name = generatedNode.name+ "_"+ id;
+    }
     var sourceNode=transition.source;
     if (sourceNode && sourceNode.isPlaceholder()) {
       var orignalTransition=this.findTransitionTo(this.startNode,sourceNode.id);