You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/06/09 11:41:42 UTC
ambari git commit: AMBARI-11792 Add Service: configs step is not
loaded after enabling kerberos. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 5f6b5871a -> 289f4887c
AMBARI-11792 Add Service: configs step is not loaded after enabling kerberos. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/289f4887
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/289f4887
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/289f4887
Branch: refs/heads/trunk
Commit: 289f4887c77a221cd8dd0cefe443077a14e0ae66
Parents: 5f6b587
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Jun 8 16:13:25 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Jun 9 12:41:32 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 4 ++--
ambari-web/app/mixins/common/configs/enhanced_configs.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/289f4887/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 b20bec0..c74bba2 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -667,8 +667,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
}
}, this);
//STEP 6: Distribute configs by service and wrap each one in App.ServiceConfigProperty (configs -> serviceConfigs)
- if (this.get('securityEnabled') && self.get('wizardController.name') == 'addServiceController') {
- this.addKerberosDescriptorConfigs(configs, self.get('wizardController.kerberosDescriptorConfigs') || []);
+ if (this.get('securityEnabled') && this.get('wizardController.name') == 'addServiceController') {
+ this.addKerberosDescriptorConfigs(configs, this.get('wizardController.kerberosDescriptorConfigs') || []);
}
this.setStepConfigs(configs, storedConfigs);
this.checkHostOverrideInstaller();
http://git-wip-us.apache.org/repos/asf/ambari/blob/289f4887/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index cd27c61..17c0872 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -107,7 +107,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
changedProperties: function() {
return this.get('_dependentConfigValues').filter(function(dp) {
return (this.get('selectedConfigGroup.isDefault') && Em.get(dp, 'configGroup').contains('Default'))
- || [this.get('selectedConfigGroup.name'), this.get('selectedConfigGroup.dependentConfigGroups')[Em.get(dp, 'serviceName')]].contains(Em.get(dp, 'configGroup'));
+ || [this.get('selectedConfigGroup.name'), this.get('selectedConfigGroup.dependentConfigGroups') && this.get('selectedConfigGroup.dependentConfigGroups')[Em.get(dp, 'serviceName')]].contains(Em.get(dp, 'configGroup'));
}, this);
}.property('_dependentConfigValues.@each.saveRecommended', 'selectedConfigGroup'),