ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-5979. Security page does not load configurations after security is enabled. (jaimin)
Date Fri, 30 May 2014 23:50:14 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6dc549cce -> c6402f582


AMBARI-5979. Security page does not load configurations after security is enabled. (jaimin)


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

Branch: refs/heads/trunk
Commit: c6402f582740b0157cf907b41cae32fa1e675867
Parents: 6dc549c
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Fri May 30 16:49:52 2014 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Fri May 30 16:49:58 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/main/admin/security.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6402f58/ambari-web/app/controllers/main/admin/security.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security.js b/ambari-web/app/controllers/main/admin/security.js
index a958088..af8c096 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -90,14 +90,16 @@ App.MainAdminSecurityController = Em.Controller.extend({
   loadStep: function () {
     var step2Controller = App.router.get('mainAdminSecurityAddStep2Controller');
     var services = this.get('services');
+    step2Controller.set('content', Em.Object.create({services: []}));
+    step2Controller.set('content.services', services);
     this.get('stepConfigs').clear();
     this.get('securityUsers').clear();
     this.get('serviceConfigTags').clear();
     this.loadSecurityUsers();
     //loadSecurityUsers - desired configs fetched from server
     step2Controller.addUserPrincipals(services, this.get('securityUsers'));
-    step2Controller.addMasterHostToGlobals(services);
-    step2Controller.addSlaveHostToGlobals(services);
+    step2Controller.addMasterHostToGlobals();
+    step2Controller.addSlaveHostToGlobals();
     this.renderServiceConfigs(services);
     step2Controller.changeCategoryOnHa(services, this.get('stepConfigs'));
 


Mime
View raw message