RANGER-4155 : Structure of resource(UI) hierarchy in policy form not proper formatted for multiple values.
Signed-off-by: Nitin Galave <ni3galave@apache.org>
(cherry picked from commit cc67b665fea0bc31c29499991ae9940983c8c1fb)
diff --git a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
index 2bc552b..369b0f6 100644
--- a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
+++ b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
@@ -782,7 +782,7 @@
recursiveSupportToggleDiv = '<div class="toggle-xa recursive-toggle '+recursiveTogglePosition+'"" data-js="recursive" style="height: 20px; width: 120px;"><div class="toggle"></div></div>';
return _.template(selectTemplate+'<input data-js="resource" type="text">'+
- excludeSupportToggleDiv+''+recursiveSupportToggleDiv);
+ '<div class="excludeRecursiveSupport">'+excludeSupportToggleDiv+''+recursiveSupportToggleDiv+'</div>');
},
});
diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css
index 52f9128..f5544cc 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -4720,6 +4720,7 @@
}
.form-resources.policy-resources .form-control.rosource-boder {
padding: 0px !important;
+ height: 100%;
}
.form-resources.policy-resources .sameLevelDropdown {
margin-right: 31px !important;
@@ -4733,4 +4734,8 @@
}
.wrap.position-relative.additional-resource{
padding: 20px 20px 0px 20px !important;
+}
+.excludeRecursiveSupport {
+ position: absolute;
+ top: 30px;
}
\ No newline at end of file
diff --git a/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html
index 864a399..5f6e996 100644
--- a/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html
+++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html
@@ -69,7 +69,7 @@
</p>
<div>
- <div data-customfields="policyResources" />
+ <div class="policyResources" data-customfields="policyResources" />
</div>
</fieldset>
<fieldset>
