Repository: ambari
Updated Branches:
  refs/heads/trunk 00fe3df41 -> 226ecd7db


AMBARI-5126. Storm: nimbus.childopts config doesn't update on Add Service 
Wizard (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/226ecd7d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/226ecd7d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/226ecd7d

Branch: refs/heads/trunk
Commit: 226ecd7db2a3a8d3d433354054c44db0266c5274
Parents: 00fe3df
Author: Alex Antonenko <[email protected]>
Authored: Tue Mar 18 18:01:22 2014 +0200
Committer: Alex Antonenko <[email protected]>
Committed: Tue Mar 18 18:01:22 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard.js                  | 7 +++++++
 ambari-web/app/controllers/wizard/step7_controller.js | 1 +
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/226ecd7d/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js 
b/ambari-web/app/controllers/wizard.js
index 3365ca2..f69ff3e 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -748,6 +748,13 @@ App.WizardController = Em.Controller.extend({
         // if modified configs detected push all service's configs for update
         if (configs.length)
           updateServiceConfigProperties = 
updateServiceConfigProperties.concat(serviceConfigProperties.filterProperty('serviceName',_content.get('serviceName')));
+        // watch for properties that are not modified but have to be updated
+        if (_content.get('configs').someProperty('forceUpdate')) {
+          // check for already added modified properties
+          if (!updateServiceConfigProperties.findProperty('serviceName', 
_content.get('serviceName'))) {
+            updateServiceConfigProperties = 
updateServiceConfigProperties.concat(serviceConfigProperties.filterProperty('serviceName',_content.get('serviceName')));
+          }
+        }
       }
     }, this);
     this.setDBProperty('serviceConfigProperties', serviceConfigProperties);

http://git-wip-us.apache.org/repos/asf/ambari/blob/226ecd7d/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index acc6c41..0adbd7f 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -332,6 +332,7 @@ App.WizardStep7Controller = Em.Controller.extend({
         var config = configs.findProperty('name', configName);
         var predefinedConfig = 
App.config.get('preDefinedSiteProperties').findProperty('name', configName);
         config.value = config.defaultValue = 
config.value.format(gangliaServerHost);
+        config.forceUpdate = true;
       }, this);
     }
   },

Reply via email to