Updated Branches: refs/heads/trunk bf55a2e12 -> b4c9c9775
AMBARI-3090: Security knob icons do not show up for YARN and MapReduce2. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b4c9c977 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b4c9c977 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b4c9c977 Branch: refs/heads/trunk Commit: b4c9c9775ae1490718585c4c9c8fd8319910c00c Parents: bf55a2e Author: Jaimin Jetly <[email protected]> Authored: Tue Sep 3 18:50:41 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Sep 3 18:50:51 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/security/disable.js | 4 ++-- ambari-web/app/controllers/main/service/info/configs.js | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b4c9c977/ambari-web/app/controllers/main/admin/security/disable.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/disable.js b/ambari-web/app/controllers/main/admin/security/disable.js index b9bdeae..4ec152f 100644 --- a/ambari-web/app/controllers/main/admin/security/disable.js +++ b/ambari-web/app/controllers/main/admin/security/disable.js @@ -26,14 +26,14 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({ } else { return require('data/secure_mapping'); } - }.property(App.isHadoop2Stack), + }.property('App.isHadoop2Stack'), secureProperties: function() { if(App.get('isHadoop2Stack')) { return require('data/HDP2/secure_properties').configProperties; } else { return require('data/secure_properties').configProperties; } - }.property(App.isHadoop2Stack), + }.property('App.isHadoop2Stack'), stages: [], configs: [], http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b4c9c977/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 7641dc1..1c994cf 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -42,7 +42,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ return App.config.get('preDefinedGlobalProperties'); }.property('App.config.preDefinedGlobalProperties'), - secureConfigs: require('data/secure_mapping'), + secureConfigs: function() { + if(App.get('isHadoop2Stack')) { + return require('data/HDP2/secure_mapping'); + } else { + return require('data/secure_mapping'); + } + }.property('App.isHadoop2Stack'), /** * During page load time, we get the host overrides from the server.
