Repository: ambari Updated Branches: refs/heads/branch-2.5 bbd9948fe -> 4d4362668
AMBARI-20266. Duplicate node error is shown if kill node transition exists from decision node in WFM.(Padma Priya N via gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d436266 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d436266 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d436266 Branch: refs/heads/branch-2.5 Commit: 4d43626687df5ae0525e75013572443917ee7572 Parents: bbd9948 Author: Gaurav Nagar <[email protected]> Authored: Thu Mar 2 19:25:53 2017 +0530 Committer: Gaurav Nagar <[email protected]> Committed: Thu Mar 2 19:26:35 2017 +0530 ---------------------------------------------------------------------- .../main/resources/ui/app/validators/duplicate-data-node-name.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4d436266/contrib/views/wfmanager/src/main/resources/ui/app/validators/duplicate-data-node-name.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/validators/duplicate-data-node-name.js b/contrib/views/wfmanager/src/main/resources/ui/app/validators/duplicate-data-node-name.js index 7336d6e..86da02b 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/validators/duplicate-data-node-name.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/validators/duplicate-data-node-name.js @@ -29,7 +29,7 @@ const DuplicateDataNodeName = BaseValidator.extend({ return "Node name should not be blank"; } Ember.set(item.data.node, "errors", false); - if(nodeNames.get(item.data.node.name)){ + if(nodeNames.get(item.data.node.name) && item.data.node.type !== 'kill'){ Ember.set(item.data.node, "errors", true); return `${item.data.node.name} : Node name should be unique`; }else{
