You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2018/03/07 06:40:54 UTC
[3/5] ranger git commit: RANGER-2008: Policy evaluation is failing
for multiline policy conditions.
RANGER-2008: Policy evaluation is failing for multiline policy conditions.
Signed-off-by: pradeep <pr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/58d1fa47
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/58d1fa47
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/58d1fa47
Branch: refs/heads/ranger-1.0
Commit: 58d1fa472bb1d7f6d5c98188f5f5631295825e02
Parents: 0e1169a
Author: ni3galave <ni...@gmail.com>
Authored: Tue Mar 6 15:10:49 2018 +0530
Committer: pradeep <pr...@apache.org>
Committed: Wed Mar 7 11:30:41 2018 +0530
----------------------------------------------------------------------
.../webapp/scripts/views/policies/PermissionList.js | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/58d1fa47/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
index 2d88b02..194f6b6 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
@@ -651,7 +651,7 @@ define(function(require) {
emptytext : 'Add Conditions',
value : this.conditions,
display: function(value) {
- var continue_ = false, i = 0;
+ var continue_ = false, i = 0, cond = [];
if(!value) {
$(this).empty();
return;
@@ -666,19 +666,18 @@ define(function(require) {
return '';
}
//Add label for policy condition
- var pcond = _.findWhere(that.multiLinecond, { 'name': name})
+ var pcond = _.findWhere(that.multiLinecond, { 'name': name});
if(!_.isUndefined(pcond) && !_.isUndefined(pcond['evaluatorOptions'])
&& ! _.isUndefined(pcond['evaluatorOptions']["ui.isMultiline"])
&& ! _.isUndefined(pcond['evaluatorOptions']['engineName'])){
- val = pcond['evaluatorOptions']['engineName'] + ' Condition'
+ cond.push({ 'type' : name, 'values' : !_.isArray(val) ? [val] : val });
+ val = pcond['evaluatorOptions']['engineName'] + ' Condition';
+ } else {
+ cond.push({ 'type' : name, 'values' : !_.isArray(val) ? val.split(',') : val });
}
i++;
- return '<span class="'+label+' white-space-normal" >'+name+' : '+ _.escape(val) + '</span>';
+ return '<span class="'+label+' white-space-normal" >'+name+' : '+ _.escape(val) + '</span>';
});
- var cond = _.map(value, function(val, name) {
- return {'type' : name, 'values' : !_.isArray(val) ? val.split(',') : val};
- });
-
that.model.set('conditions', cond);
$(this).html(html);
that.ui.addConditionsSpan.find('i').attr('class', 'icon-pencil');