Repository: ambari Updated Branches: refs/heads/branch-2.5 c21009a6b -> 30b333774
AMBARI-20161. Workflow Manager-mapred action contains duplicates in editor if user saves and reopens editor.(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/30b33377 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30b33377 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30b33377 Branch: refs/heads/branch-2.5 Commit: 30b33377457ffff6eb06c9ce751233874f7b34d1 Parents: c21009a Author: Gaurav Nagar <[email protected]> Authored: Fri Feb 24 16:55:46 2017 +0530 Committer: Gaurav Nagar <[email protected]> Committed: Fri Feb 24 16:56:31 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/components/flow-designer.js | 4 ++-- .../src/main/resources/ui/app/components/map-red-action.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/30b33377/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 de72c6d..8597d72 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 @@ -658,7 +658,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { this.set('showActionEditor', true); this.set('currentAction', node.actionType); var domain = node.getNodeDetail(); - this.set('clonedDomain',Ember.copy(domain)); + this.set('clonedDomain', JSOG.stringify(domain)); this.set('clonedErrorNode', node.errorNode); this.set('clonedKillMessage',node.get('killMessage')); node.set("domain", domain); @@ -1095,7 +1095,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { this.currentNode.onSave(); this.doValidation(); } else { - this.set('currentNode.domain',Ember.copy(this.get('clonedDomain'))); + this.set('currentNode.domain',JSOG.parse(this.get('clonedDomain'))); this.set('currentNode.errorNode', this.get('clonedErrorNode')); if(this.currentNode.type === 'kill'){ this.set('currentNode.killMessage', this.get('clonedKillMessage')); http://git-wip-us.apache.org/repos/asf/ambari/blob/30b33377/contrib/views/wfmanager/src/main/resources/ui/app/components/map-red-action.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/map-red-action.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/map-red-action.js index 3eb8545..44ac7e7 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/map-red-action.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/map-red-action.js @@ -53,6 +53,7 @@ export default Ember.Component.extend({ } var existingStaticProp = this.get(property.belongsTo).findBy('name',property.name); if(existingStaticProp){ + this.get(property.belongsTo).removeObject(existingStaticProp); Ember.set(property,'value',existingStaticProp.value); Ember.set(existingStaticProp,'static', true); }
