Repository: ambari Updated Branches: refs/heads/trunk 67bf7a6aa -> e79ff36d5
AMBARI-19354 : Invalid message is shown after saving the workflow (Padma Priya via nitirajrathore) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e79ff36d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e79ff36d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e79ff36d Branch: refs/heads/trunk Commit: e79ff36d59f89f4f76b0484cf9965c6c52c4be83 Parents: 67bf7a6 Author: Nitiraj Rathore <[email protected]> Authored: Fri Jan 6 18:34:31 2017 +0530 Committer: Nitiraj Rathore <[email protected]> Committed: Fri Jan 6 18:35:52 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/components/flow-designer.js | 2 +- .../src/main/resources/ui/app/domain/workflow-path-util.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e79ff36d/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 66123d0..2dd60a0 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 @@ -848,7 +848,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { this.set('currentNode.errorNode', transition.errorNode); } currentNode.transitions.forEach((trans)=>{ - if(transition.okToNode){ + if(transition.okToNode && trans.condition !== 'error'){ if(trans.targetNode.id !== transition.okToNode.id){ trans.targetNode = transition.okToNode; this.showUndo('transition'); http://git-wip-us.apache.org/repos/asf/ambari/blob/e79ff36d/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-path-util.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-path-util.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-path-util.js index c921455..431b59b 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-path-util.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-path-util.js @@ -66,7 +66,7 @@ export default Ember.Object.create({ }, this); }, this); validTransitionsTo = validTransitionsTo.reject((node)=>{ - return node.get('type') === 'placeholder'; + return node.get('type') === 'placeholder' || node.get('type') === 'kill'; }, this); return validTransitionsTo; }
