You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/05 14:06:04 UTC
ambari git commit: AMBARI-12645 Ranger Admin properties issues.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a471f3391 -> b4f13a2fe
AMBARI-12645 Ranger Admin properties issues. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b4f13a2f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b4f13a2f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b4f13a2f
Branch: refs/heads/trunk
Commit: b4f13a2fee5875a5079df3ccb08289b3a197f96f
Parents: a471f33
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Aug 5 15:02:46 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Aug 5 15:05:48 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js | 2 +-
ambari-web/app/data/HDP2.3/site_properties.js | 4 +++-
ambari-web/app/utils/config.js | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b4f13a2f/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 43512c2..9e1ab0d 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/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'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/b4f13a2f/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 0e68eee..2cea8a0 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/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",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b4f13a2f/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 1babe76..43771c4 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/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"
http://git-wip-us.apache.org/repos/asf/ambari/blob/b4f13a2f/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 6768f36..4395ef1 100644
--- a/ambari-web/app/utils/config.js
+++ b/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);