You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/12/07 02:26:24 UTC
git commit: AMBARI-4000: mapred-queue-acls properties are shown in
mapreduce service advanced section. (jaimin)
Updated Branches:
refs/heads/trunk 5100bb26b -> c69c33c87
AMBARI-4000: mapred-queue-acls properties are shown in mapreduce service advanced section. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c69c33c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c69c33c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c69c33c8
Branch: refs/heads/trunk
Commit: c69c33c878d7e3ab74cfa8de5f7fba26e1ef6557
Parents: 5100bb2
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Dec 6 17:25:50 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Dec 6 17:25:50 2013 -0800
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c69c33c8/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 990a5dd..e1f04da 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -679,14 +679,19 @@ App.config = Em.Object.create({
data.items.forEach(function (item) {
item = item.StackConfigurations;
item.isVisible = item.type !== 'global.xml';
- properties.push({
- serviceName: item.service_name,
- name: item.property_name,
- value: item.property_value,
- description: item.property_description,
- isVisible: item.isVisible,
- filename: item.filename || item.type
- });
+ var serviceName = item.service_name;
+ var fileName = item.type;
+ // If condition makes sure that mapred-queue-acls.xml configs are not shown in Mapreduce or Mapreduce2 service page Advanced section
+ if (fileName !== 'mapred-queue-acls.xml' || App.supports.capacitySchedulerUi === true) {
+ properties.push({
+ serviceName: serviceName,
+ name: item.property_name,
+ value: item.property_value,
+ description: item.property_description,
+ isVisible: item.isVisible,
+ filename: item.filename || fileName
+ });
+ }
}, this);
serviceComponents[data.items[0].StackConfigurations.service_name] = properties;
}