Browse Source

AMBARI-3090: Security knob icons do not show up for YARN and MapReduce2. (jaimin)

Jaimin Jetly 11 years ago
parent
commit
b4c9c9775a

+ 2 - 2
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: [],

+ 7 - 1
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.