You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/04/11 20:12:54 UTC
svn commit: r1467026 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/controllers/wizard.js ambari-web/app/utils/config.js
Author: yusaku
Date: Thu Apr 11 18:12:53 2013
New Revision: 1467026
URL: http://svn.apache.org/r1467026
Log:
AMBARI-1878. Host overrides functionality broken in wizard Step7 controller. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
incubator/ambari/trunk/ambari-web/app/utils/config.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467026&r1=1467025&r2=1467026&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 11 18:12:53 2013
@@ -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
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1467026&r1=1467025&r2=1467026&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Thu Apr 11 18:12:53 2013
@@ -692,6 +692,7 @@ App.WizardController = Em.Controller.ext
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.ext
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);
Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1467026&r1=1467025&r2=1467026&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Thu Apr 11 18:12:53 2013
@@ -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;