Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 b0d3cfb68 -> 6729af521
RANGER-575 : Allow KMS policies to be assigned to all users Signed-off-by: sneethiraj <[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/6729af52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6729af52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6729af52 Branch: refs/heads/ranger-0.5 Commit: 6729af52109835b882611687562b9d89f9b0669f Parents: b0d3cfb Author: Gautam Borad <[email protected]> Authored: Mon Jul 6 13:58:41 2015 +0530 Committer: sneethiraj <[email protected]> Committed: Mon Jul 6 05:29:34 2015 -0400 ---------------------------------------------------------------------- .../main/webapp/scripts/views/policies/PermissionList.js | 11 +---------- .../src/main/webapp/scripts/views/users/UserForm.js | 3 ++- 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6729af52/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 0901892..0cba319 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -200,16 +200,7 @@ define(function(require) { url: url, dataType: 'json', data: function (term, page) { - var data = { name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value }; - var userRoleList = [] - _.each(XAEnums.UserRoles,function(val, key){ - if(SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value == val.value){ - userRoleList.push(key) - }else if(!SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value != val.value){ - userRoleList.push(key) - } - }) - return _.extend(data,{'userRoleList' : userRoleList }); + return {name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value}; }, results: function (data, page) { var results = [] , selectedVals = []; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6729af52/security-admin/src/main/webapp/scripts/views/users/UserForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserForm.js b/security-admin/src/main/webapp/scripts/views/users/UserForm.js index 31e99ce..52a278d 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -144,7 +144,8 @@ define(function(require){ if(SessionMgr.getUserProfile().get('loginId') != "admin"){ if(this.model.get('name') != "admin"){ - if(_.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_SYS_ADMIN')){ + if(_.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_SYS_ADMIN') + || _.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_KEY_ADMIN')){ this.fields.userRoleList.editor.$el.attr('disabled',false); }else{ if(!SessionMgr.isKeyAdmin()){
