Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 9075f8937 -> 908497979
RANGER-848 : Policy Listing page fix: users column is empty for non-admin users Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/90849797 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/90849797 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/90849797 Branch: refs/heads/ranger-0.5 Commit: 9084979798c10b83e5ab87550feab14e670d0cdf Parents: 9075f89 Author: Gautam Borad <[email protected]> Authored: Tue Feb 23 11:34:25 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Tue Feb 23 12:23:25 2016 +0530 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/utils/XAUtils.js | 9 +++++---- .../scripts/views/policies/RangerPolicyTableLayout.js | 5 +---- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/90849797/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 db727ed..8735617 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -468,12 +468,13 @@ define(function(require) { XAUtils.showGroupsOrUsersForPolicy = function(rawValue, model, showGroups) { var showMoreLess = false, groupArr = []; var type = _.isUndefined(showGroups) ? 'groups' : 'users'; - if (!_.isArray(rawValue) && !_.isUndefined(rawValue[type])) - return '--'; + if (!_.isArray(rawValue)) return '--'; _.each(rawValue, function(perm) { - groupArr = _.union(groupArr, perm[type]) + if(!_.isUndefined(perm[type])){ + groupArr = _.union(groupArr, perm[type]) + } }); - + if(_.isEmpty(groupArr)) return '--'; var newGroupArr = _.map(groupArr, function(name, i) { if (i >= 4) { return '<span class="label label-info float-left-margin-2" policy-' + type http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/90849797/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 621edf6..60a2c5a 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -213,16 +213,13 @@ define(function(require){ sortable : false }, //Hack for backgrid plugin doesn't allow to have same column name - guid : { + users : { reName : 'userName', cell : Backgrid.HtmlCell.extend({className: 'cellWidth-1'}), label : localization.tt("lbl.users"), formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function (rawValue, model) { - if(!_.isUndefined(rawValue)) return XAUtil.showGroupsOrUsersForPolicy(model.get('policyItems'), model, false); - else - return '--'; } }), editable : false,
