Revert "AMBARI-14933 ranger audit db password is required even when audit to db is off.(ababiichuk)"
This reverts commit 94932c99bb8ff5ad309c15c6a0ecf382f428c73b. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24447458 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24447458 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24447458 Branch: refs/heads/trunk Commit: 2444745889faed0ccf38c3696c8e91f7e32e4c5b Parents: 1319763 Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Sat Feb 13 13:04:57 2016 +0530 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Sat Feb 13 13:04:57 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/24447458/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/24447458/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 e9eaed2..9858b75 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 @@ -434,9 +434,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]); - } } } }