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/11/23 18:28:22 UTC
ambari git commit: AMBARI-14021 Empty configurations in enable
kerbros wizard. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4b20e5c1a -> b26aa4ad2
AMBARI-14021 Empty configurations in enable kerbros wizard. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b26aa4ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b26aa4ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b26aa4ad
Branch: refs/heads/trunk
Commit: b26aa4ad22b8dd14feb850d6d2e1d5cc4c54b010
Parents: 4b20e5c
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Nov 23 19:24:25 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Nov 23 19:24:59 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b26aa4ad/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 9209add..3343c29 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -788,13 +788,15 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
var serviceName = service.get('serviceName');
if (['MISC'].concat(this.get('allSelectedServiceNames')).contains(serviceName)) {
var serviceConfig = App.config.createServiceConfig(serviceName);
+ serviceConfig.set('showConfig', App.StackService.find(serviceName).get('isInstallable'));
if (this.get('wizardController.name') == 'addServiceController') {
serviceConfig.set('selected', !this.get('installedServiceNames').concat('MISC').contains(serviceName));
if (serviceName === 'MISC') {
serviceConfig.set('configCategories', serviceConfig.get('configCategories').rejectProperty('name', 'Notifications'));
}
+ } else if (this.get('wizardController.name') == 'kerberosWizardController') {
+ serviceConfig.set('showConfig', true);
}
- serviceConfig.set('showConfig', App.StackService.find(serviceName).get('isInstallable'));
stepConfigs.pushObject(serviceConfig);
}
}, this);