浏览代码

AMBARI-12645 Ranger Admin properties issues. (ababiichuk)

aBabiichuk 10 年之前
父节点
当前提交
b4f13a2fee

+ 1 - 1
ambari-web/app/controllers/main/service/info/configs.js

@@ -94,7 +94,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
    * @type {string[]}
    */
   servicesToLoad: function() {
-    return this.get('dependentServiceNames').concat([this.get('content.serviceName')]).uniq();
+    return [this.get('content.serviceName')].concat(this.get('dependentServiceNames')).uniq();
   }.property('content.serviceName', 'dependentServiceNames.length'),
 
   /**

+ 1 - 1
ambari-web/app/data/HDP2.2/site_properties.js

@@ -486,7 +486,7 @@ hdp22properties.push(
     "isReconfigurable": true,
     "displayType": "",
     "isOverridable": false,
-    "isVisible": true,
+    "isVisible": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",

+ 3 - 1
ambari-web/app/data/HDP2.3/site_properties.js

@@ -47,7 +47,8 @@ var excludedConfigs = [
   "port",
   "hive.metastore.heapsize",
   "hive.client.heapsize",
-  "SQL_COMMAND_INVOKER"
+  "SQL_COMMAND_INVOKER",
+  "SYNC_LDAP_USER_SEARCH_FILTER"
 ];
 
 var hdp23properties = hdp22properties.filter(function (item) {
@@ -754,6 +755,7 @@ hdp23properties.push({
     "displayType": "",
     "isOverridable": false,
     "isVisible": true,
+    "isRequired": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "RangerSettings"

+ 1 - 0
ambari-web/app/utils/config.js

@@ -286,6 +286,7 @@ App.config = Em.Object.create({
           serviceConfigObj.isFinal = serviceConfigObj.savedIsFinal = finalAttributes[index] === "true";
           serviceConfigObj.isEditable = this.getIsEditable(serviceConfigObj, selectedConfigGroup, canEdit);
           serviceConfigObj.isVisible = serviceConfigObj.isVisible === false ? false : serviceName === 'MISC' ? true : serviceConfigObj.displayType !== 'user';
+          serviceConfigObj.serviceName = serviceName;
         }
 
         var serviceConfigProperty = App.ServiceConfigProperty.create(serviceConfigObj);