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 2016/02/13 08:31:27 UTC
[2/2] ambari git commit: Revert "AMBARI-14933 ranger audit db
password is required even when audit to db is off.(ababiichuk)"
Revert "AMBARI-14933 ranger audit db password is required even when audit to db is off.(ababiichuk)"
This reverts commit 7eed58d39cbb6f2800c9e96a27e90edc433c726d.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d564f86d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d564f86d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d564f86d
Branch: refs/heads/branch-2.2
Commit: d564f86d794fa2ffee14b8f980d20b32f79d7aed
Parents: a1d7b80
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Sat Feb 13 12:41:46 2016 +0530
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Sat Feb 13 12:41:46 2016 +0530
----------------------------------------------------------------------
.../services/RANGER/themes/theme_version_2.json | 20 +-------------------
.../configs/widgets/config_widget_view.js | 3 ---
2 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d564f86d/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
index cbd27e4..59e58a4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
@@ -940,25 +940,7 @@
},
{
"config": "admin-properties/audit_db_password",
- "subsection-name": "subsection-ranger-audit-db-row2-col2",
- "depends-on": [
- {
- "configs":[
- "ranger-env/xasecure.audit.destination.db"
- ],
- "if": "${ranger-env/xasecure.audit.destination.db}",
- "then": {
- "property_value_attributes": {
- "visible": true
- }
- },
- "else": {
- "property_value_attributes": {
- "visible": false
- }
- }
- }
- ]
+ "subsection-name": "subsection-ranger-audit-db-row2-col2"
},
{
"config": "ranger-env/xasecure.audit.destination.solr",
http://git-wip-us.apache.org/repos/asf/ambari/blob/d564f86d/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index a0515e6..f0499db 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -442,9 +442,6 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
var conditionalConfig = serviceConfigs.filterProperty('filename',conditionalConfigFileName).findProperty('name', conditionalConfigName);
if (conditionalConfig) {
conditionalConfig.set(valueAttribute, valueAttributes[key]);
- if (valueAttribute === 'isVisible') {
- conditionalConfig.set('hiddenBySection', !valueAttributes[key]);
- }
}
}
}