You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pa...@apache.org on 2017/02/23 07:04:10 UTC
ambari git commit: AMBARI-20134. Improper action node name after
importing the asset (Venkata Sairam via pallavkul)
Repository: ambari
Updated Branches:
refs/heads/trunk 03d0587e2 -> 82230d60a
AMBARI-20134. Improper action node name after importing the asset (Venkata Sairam via pallavkul)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82230d60
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82230d60
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82230d60
Branch: refs/heads/trunk
Commit: 82230d60a8d417809e967e55983c37a8553258a0
Parents: 03d0587
Author: pallavkul <pa...@gmail.com>
Authored: Thu Feb 23 12:28:59 2017 +0530
Committer: pallavkul <pa...@gmail.com>
Committed: Thu Feb 23 12:31:10 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/ui/app/components/flow-designer.js | 5 +++--
.../wfmanager/src/main/resources/ui/app/domain/workflow.js | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/82230d60/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index b2b9c68..f97add8 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ b/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')});
http://git-wip-us.apache.org/repos/asf/ambari/blob/82230d60/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow.js
index 0fc5d6c..be8d8de 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow.js
+++ b/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);