Repository: incubator-ranger Updated Branches: refs/heads/master e488e8df5 -> 321c9d963
RANGER-709 : Support-policy-conditions-that-handle-only-a-single-value Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/e2fe01c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/e2fe01c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/e2fe01c3 Branch: refs/heads/master Commit: e2fe01c390f11750358912504286fbf740e9692d Parents: e488e8d Author: Mehul Parikh <[email protected]> Authored: Thu Jun 16 10:27:30 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Tue Jun 21 15:18:25 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/scripts/utils/XAUtils.js | 6 ++++-- .../webapp/scripts/views/policies/PermissionList.js | 13 +++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2fe01c3/security-admin/src/main/webapp/scripts/utils/XAUtils.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js index a0b282e..0b7fb04 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -947,8 +947,9 @@ define(function(require) { that.$(that.rForm.el).removeClass("policy-disabled"); } }; - XAUtils.customXEditableForPolicyCond = function(template) { + XAUtils.customXEditableForPolicyCond = function(template,selectionList) { // $.fn.editable.defaults.mode = 'inline'; + var PolicyConditions = function(options) { this.init('policyConditions', options, PolicyConditions.defaults); }; @@ -967,8 +968,9 @@ define(function(require) { minimumInputLength : 1, tokenSeparators : [ ",", ";" ], } - _.each(this.$input, function(elem){ + _.each(this.$input, function(elem,index){ if($(elem).is('input')){ + pluginOpts.maximumSelectionSize = selectionList[index]; $(elem).select2(pluginOpts); } }) http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2fe01c3/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 44a6c80..0416ad6 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -432,8 +432,17 @@ define(function(require) { //to show only mutiline line policy codition this.multiLinecond = _.filter(that.policyConditions, function(m){ return (!_.isUndefined(m.evaluatorOptions['ui.isMultiline']) && m.evaluatorOptions['ui.isMultiline']) }); this.multiLinecond = _.isArray(this.multiLinecond) ? this.multiLinecond : [this.multiLinecond]; - //Create new bootstrap x-editable `policyConditions` dataType for policy conditions - XAUtil.customXEditableForPolicyCond(tmpl.join('')); + //get the select input size(for bootstrap x-editable) of policy conditions + var selectSizeList = []; + _.each(this.policyConditions,function(policyCondition){ + if (XAUtil.isSinglevValueInput(policyCondition)) { + selectSizeList.push(1); + } else { + selectSizeList.push(undefined); + } + }); + //Create new bootstrap x-editable `policyConditions` dataType for policy conditions + XAUtil.customXEditableForPolicyCond(tmpl.join(''),selectSizeList); //create x-editable for policy conditions this.$('#policyConditions').editable({ emptytext : 'Add Conditions',
