Repository: incubator-ranger Updated Branches: refs/heads/master da3a3233d -> e85eb01d5
RANGER-912 : Admin UI updates to support masking and row-level filtering policies - (fixed case for enableDenyAndExceptionsInPolicies=true for masking and row-level filtering) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/e85eb01d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/e85eb01d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/e85eb01d Branch: refs/heads/master Commit: e85eb01d57154c51f248f969084a6ed90a8d19af Parents: da3a323 Author: Gautam Borad <[email protected]> Authored: Wed Apr 13 12:25:27 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Thu Apr 14 10:08:55 2016 +0530 ---------------------------------------------------------------------- .../src/main/webapp/scripts/views/policies/RangerPolicyForm.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e85eb01d/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js index 253031d..ac354fd 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js @@ -226,8 +226,7 @@ define(function(require){ enableDenyAndExceptionsInPolicies = false; //By default hide the PolicyItems for all component except tag component if((!_.isUndefined(serviceDefOptions) && !_.isUndefined(serviceDefOptions.enableDenyAndExceptionsInPolicies))){ - if( !XAUtil.isAccessPolicy(this.model.get('policyType')) ) return; - enableDenyAndExceptionsInPolicies = $.parseJSON(serviceDefOptions.enableDenyAndExceptionsInPolicies); + enableDenyAndExceptionsInPolicies = XAUtil.isAccessPolicy(this.model.get('policyType')) && $.parseJSON(serviceDefOptions.enableDenyAndExceptionsInPolicies); } else { if(this.rangerServiceDefModel.get('name') == XAEnums.ServiceType.SERVICE_TAG.label){ enableDenyAndExceptionsInPolicies = true;
