ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-14487. Kerberos Wizard: Configure Kerberos step throws js error (alexantonenko)
Date Thu, 24 Dec 2015 16:07:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e0f3490e9 -> 9df5e635a


AMBARI-14487. Kerberos Wizard: Configure Kerberos step throws js error (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9df5e635
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9df5e635
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9df5e635

Branch: refs/heads/trunk
Commit: 9df5e635a2fbdc735a1186ed55ab5a277b6d48df
Parents: e0f3490
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Wed Dec 23 18:08:55 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Dec 24 18:07:39 2015 +0200

----------------------------------------------------------------------
 .../controllers/main/admin/kerberos/step2_controller.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9df5e635/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 4f9e0fb..9b411c6 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -74,14 +74,22 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
    * On load function
    * @method loadStep
    */
+
   loadStep: function () {
     if (!App.StackService.find().someProperty('serviceName', 'KERBEROS') || !this.get('isConfigsLoaded'))
{
       return;
     }
     this.clearStep();
-    //STEP 3: Merge pre-defined configs with loaded on-site configs
-    this.set('configs', App.configsCollection.getAll());
     App.config.setPreDefinedServiceConfigs(this.get('addMiscTabToPage'));
+    var stored = this.get('content.serviceConfigProperties');
+    var kerberosConfigTypes = Em.keys(App.config.get('preDefinedServiceConfigs').findProperty('serviceName',
'KERBEROS').get('configTypes'));
+
+    this.set('configs', stored || App.configsCollection.getAll().filter(function(configProperty)
{
+      var fileName = Em.getWithDefault(configProperty, 'fileName', false);
+      var isService = ['KERBEROS'].contains(Em.get(configProperty, 'serviceName'));
+      var isFileName = fileName && kerberosConfigTypes.contains(App.config.getConfigTagFromFileName(fileName));
+      return isService || isFileName;
+    }));
 
     this.filterConfigs(this.get('configs'));
     if (App.get('supports.storeKDCCredentials') && !this.get('wizardController.skipClientInstall'))
{


Mime
View raw message