Repository: ambari Updated Branches: refs/heads/trunk 0c67a83ce -> 954bc6f6d
AMBARI-11144. Kerberos: service page incorrect with manual (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/954bc6f6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/954bc6f6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/954bc6f6 Branch: refs/heads/trunk Commit: 954bc6f6d8cde1633eef945ad1115be3e31a44f0 Parents: 0c67a83 Author: Robert Levas <[email protected]> Authored: Thu May 21 20:50:39 2015 -0400 Committer: Robert Levas <[email protected]> Committed: Thu May 21 20:50:55 2015 -0400 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/kerberos.js | 7 +++++++ .../controllers/main/admin/kerberos/step2_controller.js | 12 +++--------- .../main/admin/kerberos/wizard_controller.js | 2 +- ambari-web/app/controllers/main/service/info/configs.js | 12 ++++++++++++ 4 files changed, 23 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/954bc6f6/ambari-web/app/controllers/main/admin/kerberos.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js index 47ca736..0be41fb 100644 --- a/ambari-web/app/controllers/main/admin/kerberos.js +++ b/ambari-web/app/controllers/main/admin/kerberos.js @@ -26,6 +26,13 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({ dataIsLoaded: false, isRecommendedLoaded: true, kdc_type: 'none', + + kdcTypesValues: { + 'mit-kdc' : Em.I18n.t('admin.kerberos.wizard.step1.option.kdc'), + 'active-directory': Em.I18n.t('admin.kerberos.wizard.step1.option.ad'), + 'none' : Em.I18n.t('admin.kerberos.wizard.step1.option.manual') + }, + getAddSecurityWizardStatus: function () { return App.db.getSecurityWizardStatus(); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/954bc6f6/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js index 947ea12..38d87d3 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js @@ -24,12 +24,6 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({ isKerberosWizard: true, - kdcTypesValues: { - 'mit-kdc' : Em.I18n.t('admin.kerberos.wizard.step1.option.kdc'), - 'active-directory': Em.I18n.t('admin.kerberos.wizard.step1.option.ad'), - 'none' : Em.I18n.t('admin.kerberos.wizard.step1.option.manual') - }, - selectedServiceNames: ['KERBEROS'], allSelectedServiceNames: ['KERBEROS'], @@ -271,9 +265,9 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({ }, tweakKdcTypeValue: function (properties) { - for (var prop in this.get('kdcTypesValues')) { - if (this.get('kdcTypesValues').hasOwnProperty(prop)) { - if (this.get('kdcTypesValues')[prop] === properties['kdc_type']) { + for (var prop in App.router.get('mainAdminKerberosController.kdcTypesValues')) { + if (App.router.get('mainAdminKerberosController.kdcTypesValues').hasOwnProperty(prop)) { + if (App.router.get('mainAdminKerberosController.kdcTypesValues')[prop] === properties['kdc_type']) { properties['kdc_type'] = prop; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/954bc6f6/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js index 738af3f..d01c581 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js @@ -174,7 +174,7 @@ App.KerberosWizardController = App.WizardController.extend({ }, /** - * Overide the visibility of a list of form items with a new value + * Override the visibility of a list of form items with a new value * * @param {Array} itemsArray * @param newValue http://git-wip-us.apache.org/repos/asf/ambari/blob/954bc6f6/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index f6a9600..f492da1 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -409,6 +409,18 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM var configsToSkip = self.get('advancedConfigs').filterProperty('filename', 'capacity-scheduler.xml').filterProperty('subSection'); configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml', configsToSkip); } + + if (self.get('content.serviceName') === 'KERBEROS') { + var kdc_type = configs.findProperty('name', 'kdc_type'); + if (kdc_type.get('value') === 'none') { + configs.findProperty('name', 'kdc_host').set('isRequired', false).set('isVisible', false); + configs.findProperty('name', 'admin_server_host').set('isRequired', false).set('isVisible', false); + configs.findProperty('name', 'domains').set('isRequired', false).set('isVisible', false); + } + + kdc_type.set('value', App.router.get('mainAdminKerberosController.kdcTypesValues')[kdc_type.get('value')]); + } + self.set('allConfigs', configs); //add configs as names of host components self.addHostNamesToConfig();
