ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gna...@apache.org
Subject ambari git commit: AMBARI-20161. Workflow Manager-mapred action contains duplicates in editor if user saves and reopens editor.(Padma Priya N via gauravn7)
Date Fri, 24 Feb 2017 11:25:57 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b82d59359 -> a2ea1f976


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/a2ea1f97
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2ea1f97
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2ea1f97

Branch: refs/heads/trunk
Commit: a2ea1f9769f3c49652064b54b3e71084606a3bcd
Parents: b82d593
Author: Gaurav Nagar <grvngr@gmail.com>
Authored: Fri Feb 24 16:55:46 2017 +0530
Committer: Gaurav Nagar <grvngr@gmail.com>
Committed: Fri Feb 24 16:55:46 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/a2ea1f97/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/a2ea1f97/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);
       }


Mime
View raw message