Repository: incubator-ranger Updated Branches: refs/heads/master a918de33d -> 91b10ac8e
RANGER-848: Policy listing page fix: users column empty for non-admin users Signed-off-by: Madhan Neethiraj <[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/91b10ac8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/91b10ac8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/91b10ac8 Branch: refs/heads/master Commit: 91b10ac8ea4acec0ec1533573778a4d20a7dd20e Parents: a918de3 Author: Gautam Borad <[email protected]> Authored: Mon Feb 15 17:19:15 2016 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Tue Feb 16 11:41:10 2016 -0800 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/utils/XAUtils.js | 2 +- .../webapp/scripts/views/policies/RangerPolicyTableLayout.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/91b10ac8/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 aa904a8..bba290e 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -477,7 +477,7 @@ define(function(require) { _.each(items, function(perm) { groupArr = _.union(groupArr, perm[type]) }); - if (_.isEmpty(items)) + if (_.isEmpty(items) || _.isEmpty(groupArr)) return '--'; var newGroupArr = _.map(groupArr, function(name, i) { if (i >= 4) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/91b10ac8/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 59aac0d..58fa8a5 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -210,16 +210,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,
