RANGER-617 : Handle Search by status on policy search filter 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/beb08512 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/beb08512 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/beb08512 Branch: refs/heads/tag-policy Commit: beb08512936dc8537c36a4f5b3dd6355ad57ed94 Parents: d37e39e Author: Gautam Borad <[email protected]> Authored: Tue Aug 18 15:50:17 2015 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Mon Aug 24 16:00:58 2015 -0700 ---------------------------------------------------------------------- .../webapp/scripts/views/policies/RangerPolicyTableLayout.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/beb08512/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js index 9a6b92f..c809294 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -316,11 +316,12 @@ define(function(require){ addVisualSearch : function(){ var that = this; var resourceSearchOpt = _.map(this.rangerServiceDefModel.get('resources'), function(resource){ return XAUtil.capitaliseFirstLetter(resource.name) }); + var PolicyStatusValue = _.map(XAEnums.ActiveStatus, function(status) { return { 'label': status.label, 'value': Boolean(status.value)}; }); var searchOpt = ['Policy Name','Group Name','User Name','Status'];//,'Start Date','End Date','Today']; searchOpt = _.union(searchOpt, resourceSearchOpt) var serverAttrName = [{text : "Policy Name", label :"policyName"},{text : "Group Name", label :"group"}, - {text : "User Name", label :"user"}, {text : "Status", label :"isEnabled"}]; + {text : "User Name", label :"user"}, {text : "Status", label :"isEnabled",'multiple' : true, 'optionsArr' : PolicyStatusValue}]; // {text : 'Start Date',label :'startDate'},{text : 'End Date',label :'endDate'}, // {text : 'Today',label :'today'}]; var serverRsrcAttrName = _.map(resourceSearchOpt,function(opt){ @@ -363,7 +364,7 @@ define(function(require){ if(obj.label != XAEnums.ActiveStatus.STATUS_DELETED.label) return obj; }); - return _.map(activeStatusList, function(status) { return { 'label': status.label, 'value': status.label.toLowerCase()}; }) + return _.map(activeStatusList, function(status) { return { 'label': status.label, 'value': status.label}; }) }, /** on close */ onClose: function(){
