Переглянути джерело

AMBARI-14933 ranger audit db password is required even when audit to db is off.(ababiichuk)

ababiichuk 9 роки тому
батько
коміт
94932c99bb

+ 19 - 1
ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/themes/theme_version_1.json

@@ -525,7 +525,25 @@
         },
         },
         {
         {
           "config": "admin-properties/audit_db_password",
           "config": "admin-properties/audit_db_password",
-          "subsection-name": "subsection-ranger-audit-db-row2-col2"
+          "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
+                }
+              }
+            }
+          ]
         }
         }
       ]
       ]
     },
     },

+ 19 - 1
ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json

@@ -904,7 +904,25 @@
         },
         },
         {
         {
           "config": "admin-properties/audit_db_password",
           "config": "admin-properties/audit_db_password",
-          "subsection-name": "subsection-ranger-audit-db-row2-col2"
+          "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
+                }
+              }
+            }
+          ]
         },
         },
         {
         {
           "config": "ranger-env/xasecure.audit.destination.solr",
           "config": "ranger-env/xasecure.audit.destination.solr",

+ 3 - 0
ambari-web/app/views/common/configs/widgets/config_widget_view.js

@@ -434,6 +434,9 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
         var conditionalConfig = serviceConfigs.filterProperty('filename',conditionalConfigFileName).findProperty('name', conditionalConfigName);
         var conditionalConfig = serviceConfigs.filterProperty('filename',conditionalConfigFileName).findProperty('name', conditionalConfigName);
         if (conditionalConfig) {
         if (conditionalConfig) {
           conditionalConfig.set(valueAttribute, valueAttributes[key]);
           conditionalConfig.set(valueAttribute, valueAttributes[key]);
+          if (valueAttribute === 'isVisible') {
+            conditionalConfig.set('hiddenBySection', !valueAttributes[key]);
+          }
         }
         }
       }
       }
     }
     }