Переглянути джерело

AMBARI-11845. Popup during enabling HDFS ranger plugin should not happen for 2.2 stack (akovalenko)

Aleksandr Kovalenko 10 роки тому
батько
коміт
e93d40045b

+ 2 - 2
ambari-web/app/utils/configs/modification_handlers/hdfs.js

@@ -26,13 +26,13 @@ module.exports = App.ServiceConfigModificationHandler.create({
     var newValue = changedConfig.get("value");
     var rangerPluginEnabledName = "ranger-hdfs-plugin-enabled";
     var affectedPropertyName = changedConfig.get("name");
-    if (affectedPropertyName == rangerPluginEnabledName) {
+    if (App.get('isHadoop23Stack') && affectedPropertyName == rangerPluginEnabledName) {
       var configDfsPermissionsEnabled = this.getConfig(allConfigs, 'dfs.permissions.enabled', 'hdfs-site.xml', 'HDFS');
       var configAttributesProviderClass = this.getConfig(allConfigs, 'dfs.namenode.inode.attributes.provider.class', 'hdfs-site.xml', 'HDFS');
       var isAttributesProviderClassSet = typeof configAttributesProviderClass !== 'undefined';
 
       var rangerPluginEnabled = newValue == "Yes";
-      var newDfsPermissionsEnabled = rangerPluginEnabled ? "true" : "true";
+      var newDfsPermissionsEnabled = rangerPluginEnabled ? "true" : "false";
       var newAttributesProviderClass = 'org.apache.ranger.authorization.hadoop.RangerHdfsAuthorizer';
 
       // Add HDFS-Ranger configs

+ 1 - 1
ambari-web/app/utils/configs/modification_handlers/misc.js

@@ -65,7 +65,7 @@ module.exports = App.ServiceConfigModificationHandler.create({
         currentUsers = currentAclValueSplits[0];
         currentGroups = currentAclValueSplits[1];
       } else {
-        currentUsers = currentAclValueSplits.length > 0 ? currentAclValueSplits.shift() : ''
+        currentUsers = currentAclValueSplits.length > 0 ? currentAclValueSplits.shift() : '';
         currentGroups = currentAclValueSplits.join(" ");
       }
       var currentUserList = currentUsers.split(',').filter(function(i) { return !Em.isEmpty(i); });