AMBARI-1878. Host overrides functionality broken in wizard Step7 controller. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1467026 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -687,6 +687,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1878. Host overrides functionality broken in wizard Step7 controller.
+ (yusaku)
+
  AMBARI-1875. Restart Service tooltip overlaps another tooltip. (yusaku)
 
  AMBARI-1874. Add Service Wizard: remove the ability to install master

ambari-web/app/controllers/wizard.js

@@ -692,6 +692,7 @@ App.WizardController = Em.Controller.extend({
             overridesArray.push(overrideEntry);
           });
         }
+        overridesArray = (overridesArray.length) ? overridesArray : null;
         var configProperty = {
           id: _configProperties.get('id'),
           name: _configProperties.get('name'),
@@ -699,7 +700,8 @@ App.WizardController = Em.Controller.extend({
           defaultValue: _configProperties.get('defaultValue'),
           serviceName: _configProperties.get('serviceName'),
           domain:  _configProperties.get('domain'),
-          filename: _configProperties.get('filename')
+          filename: _configProperties.get('filename'),
+          overrides: overridesArray
         };
         serviceConfigProperties.push(configProperty);
       }, this);

ambari-web/app/utils/config.js

@@ -206,7 +206,8 @@ App.config = Em.Object.create({
             filename: stored.filename,
             category: configCategory,
             isUserProperty: true,
-            isOverridable: true
+            isOverridable: true,
+            overrides: stored.overrides
           }
         } else if (preDefined && !stored) {
           configData = preDefined;