RANGER-646: label updates in policy edit UI: Exceptions ==> Exclude from Allow Conditions/Exclude from Deny Conditions
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/2f64a689 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/2f64a689 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/2f64a689 Branch: refs/heads/master Commit: 2f64a68999fafdd0eea5cadfb6180d6d5d464d11 Parents: 9a39891 Author: Madhan Neethiraj <[email protected]> Authored: Tue Oct 13 18:11:24 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Tue Oct 13 18:11:24 2015 -0700 ---------------------------------------------------------------------- .../src/main/webapp/scripts/views/policies/RangerPolicyRO.js | 4 ++-- .../main/webapp/templates/policies/RangerPolicyForm_tmpl.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2f64a689/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js index e05d517..3ac07a2 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js @@ -121,9 +121,9 @@ define(function(require) { var headers = this.getPermHeaders(); this.policyDetails['policyCondition'] = headers.policyCondition; var items = [{'itemName': 'policyItems',title : 'Allow Condition'}, - {'itemName': 'allowExceptions',title : 'Allow Exception'}, + {'itemName': 'allowExceptions',title : 'Exclude from Allow Conditions'}, {'itemName': 'denyPolicyItems',title : 'Deny Condition'}, - {'itemName': 'denyExceptions',title : 'Deny Exception'},] + {'itemName': 'denyExceptions',title : 'Exclude from Deny Conditions'},] _.each(items, function(item){ if(!_.isUndefined(this.policy.get(item.itemName)) && !_.isEmpty(this.policy.get(item.itemName))){ this.policyDetails['policyItemsCond'].push({ title : item.title, headers : headers.header, policyItems : this.policy.get(item.itemName)}) http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2f64a689/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html ---------------------------------------------------------------------- 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 e4d6086..9b56bca 100644 --- a/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html +++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html @@ -44,7 +44,7 @@ </div> <div class="form-indent-right"> <p class="wrap-header reportSearchHeader"> - Exceptions : + Exclude from Allow Conditions : </p> <div class="wrap position-relative" > @@ -74,7 +74,7 @@ </div> <div class="form-indent-right"> <p class="wrap-header reportSearchHeader"> - Exceptions : + Exclude from Deny Conditions : </p> <div class="wrap position-relative" > <div class="" data-customfields="groupPermsDenyExclude">
