You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/07/24 17:17:16 UTC
git commit: AMBARI-6586. Flume add-service wizard has some
configuration issues (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4360fc62e -> 5035c7c19
AMBARI-6586. Flume add-service wizard has some configuration issues (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5035c7c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5035c7c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5035c7c1
Branch: refs/heads/trunk
Commit: 5035c7c19b53ae37170c81a8934ddde78da5b77c
Parents: 4360fc6
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Jul 23 20:43:38 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jul 24 17:51:48 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5035c7c1/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 822c014..50f068e 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -673,7 +673,7 @@ App.WizardStep7Controller = Em.Controller.extend({
if (this.get('wizardController.name') === 'addServiceController') {
App.router.get('configurationController').getConfigsByTags(this.get('serviceConfigTags')).done(function (loadedConfigs) {
- self.setInstalledServiceConfigs(self.get('serviceConfigTags'), configs, loadedConfigs);
+ self.setInstalledServiceConfigs(self.get('serviceConfigTags'), configs, loadedConfigs, self.get('installedServiceNames'));
self.applyServicesConfigs(configs, storedConfigs);
});
} else {
@@ -809,7 +809,7 @@ App.WizardStep7Controller = Em.Controller.extend({
* @param configs
* @method setInstalledServiceConfigs
*/
- setInstalledServiceConfigs: function (serviceConfigTags, configs, configsByTags) {
+ setInstalledServiceConfigs: function (serviceConfigTags, configs, configsByTags, installedServiceNames) {
var configsMap = {};
var configTypeMap = {};
var configMixin = App.get('config');
@@ -822,7 +822,7 @@ App.WizardStep7Controller = Em.Controller.extend({
}
});
configs.forEach(function (_config) {
- if (!Em.isNone(configsMap[_config.name])) {
+ if (!Em.isNone(configsMap[_config.name]) && installedServiceNames && installedServiceNames.contains(_config.serviceName)) {
// prevent overriding already edited properties
if (_config.defaultValue != configsMap[_config.name])
_config.value = configsMap[_config.name];