ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sneet...@apache.org
Subject git commit: ARGUS-61:Fixed-Firefox-issue-blank-Select-Role-Field-in-Edit-User
Date Wed, 17 Sep 2014 15:12:25 GMT
Repository: incubator-argus
Updated Branches:
  refs/heads/master 26705298b -> 9736e8b78


ARGUS-61:Fixed-Firefox-issue-blank-Select-Role-Field-in-Edit-User

Signed-off-by: sneethiraj <sneethir@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/9736e8b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/9736e8b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/9736e8b7

Branch: refs/heads/master
Commit: 9736e8b7889b9d5f1af74756ada4eb7f258207a6
Parents: 2670529
Author: vperiasamy <vperiasamy@hortonworks.com>
Authored: Tue Sep 16 17:03:21 2014 -0400
Committer: sneethiraj <sneethir@apache.org>
Committed: Wed Sep 17 11:12:14 2014 -0400

----------------------------------------------------------------------
 .../src/main/webapp/scripts/views/user/UserProfileForm.js          | 2 ++
 security-admin/src/main/webapp/scripts/views/users/UserForm.js     | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/9736e8b7/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js
index dafd44d..e2eec02 100644
--- a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js
+++ b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js
@@ -78,6 +78,8 @@ define(function(require){
 					if(!_.isUndefined(roleList) && roleList.length > 0){
 						if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value)
 							this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value);
+						else
+							this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value);
 					}
 				}
 				if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource')
== XAEnums.UserSource.XA_USER.value){

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/9736e8b7/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 d8b4f38..cfaedd6 100644
--- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js
+++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js
@@ -129,6 +129,8 @@ define(function(require){
 					if(!_.isUndefined(roleList) && roleList.length > 0){
 						if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value)
 							this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value);
+						else
+							this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value);
 					}
 				}
 				if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource')
== XAEnums.UserSource.XA_USER.value){


Mime
View raw message