From commits-return-4747-archive-asf-public=cust-asf.ponee.io@ranger.apache.org Thu Sep 27 02:23:54 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0D425180629 for ; Thu, 27 Sep 2018 02:23:53 +0200 (CEST) Received: (qmail 44904 invoked by uid 500); 27 Sep 2018 00:23:53 -0000 Mailing-List: contact commits-help@ranger.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.apache.org Delivered-To: mailing list commits@ranger.apache.org Received: (qmail 44893 invoked by uid 99); 27 Sep 2018 00:23:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2018 00:23:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0A6EE0051; Thu, 27 Sep 2018 00:23:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: abhay@apache.org To: commits@ranger.apache.org Date: Thu, 27 Sep 2018 00:23:52 -0000 Message-Id: <5ae81f454f444afdbfd5f9a55c881fd1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ranger git commit: RANGER-2008: Policy evaluation is failing for multiline policy conditions. Repository: ranger Updated Branches: refs/heads/ranger-0.7 508d347bc -> 92bdc78f3 RANGER-2008: Policy evaluation is failing for multiline policy conditions. Signed-off-by: pradeep Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/3d430201 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/3d430201 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/3d430201 Branch: refs/heads/ranger-0.7 Commit: 3d430201d2e90708da3bae8ee0034f32e1c925f7 Parents: 508d347 Author: ni3galave Authored: Tue Mar 6 15:10:49 2018 +0530 Committer: Abhay Kulkarni Committed: Wed Sep 26 16:58:44 2018 -0700 ---------------------------------------------------------------------- .../webapp/scripts/views/policies/PermissionList.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/3d430201/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 c4aad36..9184675 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -530,7 +530,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; @@ -545,19 +545,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 ''+name+' : '+ _.escape(val) + ''; + return ''+name+' : '+ _.escape(val) + ''; }); - 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');