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 2015/10/09 22:26:01 UTC
ambari git commit: AMBARI-13370. Add Service Wizard->service
configuration page: Recommended configs of different service are not getting
updated. (Andrii Babiichuk via jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 dab7b37d9 -> fadc4f709
AMBARI-13370. Add Service Wizard->service configuration page: Recommended configs of different service are not getting updated. (Andrii Babiichuk via jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fadc4f70
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fadc4f70
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fadc4f70
Branch: refs/heads/branch-2.1
Commit: fadc4f70901c63299fb357fe122fe2416b209353
Parents: dab7b37
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Oct 9 13:23:42 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Oct 9 13:23:42 2015 -0700
----------------------------------------------------------------------
.../RANGER/0.4.0/configuration/ranger-env.xml | 42 ++++++++++----------
.../mixins/common/configs/enhanced_configs.js | 4 +-
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fadc4f70/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index d794262..b691def 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -107,7 +107,7 @@
<property>
<name>ranger-hdfs-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>HDFS Ranger Plugin</display-name>
<description>Enable HDFS Ranger plugin</description>
<value-attributes>
@@ -115,11 +115,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -129,7 +129,7 @@
<property>
<name>ranger-hive-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>Hive Ranger Plugin</display-name>
<description>Enable Hive Ranger plugin</description>
<value-attributes>
@@ -137,11 +137,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -151,7 +151,7 @@
<property>
<name>ranger-hbase-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>Hbase Ranger Plugin</display-name>
<description>Enable HBase Ranger plugin</description>
<value-attributes>
@@ -159,11 +159,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -173,7 +173,7 @@
<property>
<name>ranger-storm-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>Storm Ranger Plugin</display-name>
<description>Enable Storm Ranger plugin</description>
<value-attributes>
@@ -181,11 +181,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -195,7 +195,7 @@
<property>
<name>ranger-kafka-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>Kafka Ranger Plugin</display-name>
<description>Enable Kafka Ranger plugin</description>
<value-attributes>
@@ -203,11 +203,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -217,7 +217,7 @@
<property>
<name>ranger-knox-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>Knox Ranger Plugin</display-name>
<description>Enable Knox Ranger plugin</description>
<value-attributes>
@@ -225,11 +225,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
@@ -239,7 +239,7 @@
<property>
<name>ranger-yarn-plugin-enabled</name>
- <value>false</value>
+ <value>No</value>
<display-name>YARN Ranger Plugin</display-name>
<description>Enable YARN Ranger plugin</description>
<value-attributes>
@@ -247,11 +247,11 @@
<type>value-list</type>
<entries>
<entry>
- <value>true</value>
+ <value>Yes</value>
<label>Enabled</label>
</entry>
<entry>
- <value>false</value>
+ <value>No</value>
<label>Disabled</label>
</entry>
</entries>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fadc4f70/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 621088a..7976b2f 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -434,7 +434,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
this.set('_fileNamesToUpdate', fileNamesToUpdate);
}
var notDefaultGroup = !!selectedConfigGroup;
- var parentPropertiesNames = parentConfigs ? parentConfigs.mapProperty('name') : [];
+ var parentPropertiesNames = parentConfigs ? parentConfigs.map(function(p) { return App.config.configId(Em.get(p, 'name'), Em.get(p, 'type'))}) : [];
/** get all configs by config group **/
for (var key in configObject) {
@@ -471,7 +471,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
initialValue = validator.isValidFloat(initialValue) ? parseFloat(initialValue).toString() : initialValue;
recommendedValue = validator.isValidFloat(recommendedValue) ? parseFloat(recommendedValue).toString() : recommendedValue;
- if (!updateOnlyBoundaries && !parentPropertiesNames.contains(propertyName) && initialValue != recommendedValue) { //on first initial request we don't need to change values
+ if (!updateOnlyBoundaries && !parentPropertiesNames.contains(App.config.configId(propertyName, key)) && initialValue != recommendedValue) { //on first initial request we don't need to change values
if (dependentProperty) {
Em.set(dependentProperty, 'value', initialValue);
Em.set(dependentProperty, 'recommendedValue', recommendedValue);