diff --git a/api/user.go b/api/user.go index 24f004c4be..54b85e1408 100644 --- a/api/user.go +++ b/api/user.go @@ -292,7 +292,7 @@ func (ua *UserAPI) ChangePassword() { } } -// ToggleUserAdminRole handles PUT api/users/{}/toggleadmin +// ToggleUserAdminRole handles PUT api/users/{}/sysadmin func (ua *UserAPI) ToggleUserAdminRole() { if !ua.IsAdmin { log.Warningf("current user, id: %d does not have admin role, can not update other user's role", ua.currentUserID) diff --git a/static/resources/js/components/project-member/project-member.config.js b/static/resources/js/components/project-member/project-member.config.js index 49825c5e7e..91f76fc637 100644 --- a/static/resources/js/components/project-member/project-member.config.js +++ b/static/resources/js/components/project-member/project-member.config.js @@ -9,7 +9,6 @@ function roles() { return [ - {'id': '0', 'name': 'N/A', 'roleName': 'n/a'}, {'id': '1', 'name': 'Project Admin', 'roleName': 'projectAdmin'}, {'id': '2', 'name': 'Developer', 'roleName': 'developer'}, {'id': '3', 'name': 'Guest', 'roleName': 'guest'} diff --git a/static/resources/js/components/replication/list-replication.directive.html b/static/resources/js/components/replication/list-replication.directive.html index 56dd5d1821..85756ba7f0 100644 --- a/static/resources/js/components/replication/list-replication.directive.html +++ b/static/resources/js/components/replication/list-replication.directive.html @@ -49,13 +49,13 @@ -
//vm.projects ? vm.projects.length : 0// // 'items' | tr //
+
//vm.replicationPolicies ? vm.replicationPolicies.length : 0// // 'items' | tr //

Replication Jobs


- + diff --git a/static/resources/js/components/user/list-user.directive.html b/static/resources/js/components/user/list-user.directive.html index 3a00ddd6c7..928dfea975 100644 --- a/static/resources/js/components/user/list-user.directive.html +++ b/static/resources/js/components/user/list-user.directive.html @@ -12,17 +12,16 @@
- + - diff --git a/static/resources/js/components/user/toggle-admin.directive.js b/static/resources/js/components/user/toggle-admin.directive.js index 389d033f23..68274cbe7e 100644 --- a/static/resources/js/components/user/toggle-admin.directive.js +++ b/static/resources/js/components/user/toggle-admin.directive.js @@ -12,10 +12,11 @@ var vm = this; vm.isAdmin = (vm.hasAdminRole == 1) ? true : false; + vm.enabled = vm.isAdmin ? 0 : 1; vm.toggle = toggle; function toggle() { - ToggleAdminService(vm.userId) + ToggleAdminService(vm.userId, vm.enabled) .success(toggleAdminSuccess) .error(toggleAdminFailed); } diff --git a/static/resources/js/layout/project/project.controller.js b/static/resources/js/layout/project/project.controller.js index 095b6eb626..e32d05a1d8 100644 --- a/static/resources/js/layout/project/project.controller.js +++ b/static/resources/js/layout/project/project.controller.js @@ -36,8 +36,11 @@ } function getProjectRole(roleId) { - var role = getRole({'key': 'roleId', 'value': roleId}); - return role.name; + if(roleId !== 0) { + var role = getRole({'key': 'roleId', 'value': roleId}); + return role.name; + } + return ''; } function listProjectFailed(e) { diff --git a/static/resources/js/services/project-member/services.add-project-member.js b/static/resources/js/services/project-member/services.add-project-member.js index 3b3b8aedfc..0a0265eea0 100644 --- a/static/resources/js/services/project-member/services.add-project-member.js +++ b/static/resources/js/services/project-member/services.add-project-member.js @@ -16,7 +16,7 @@ return $http .post('/api/projects/' + projectId + '/members/', { 'roles': [ Number(roles) ], - 'user_name': username + 'username': username }); } diff --git a/static/resources/js/services/user/services.toggle-admin.js b/static/resources/js/services/user/services.toggle-admin.js index cb90d5af59..290cac4a53 100644 --- a/static/resources/js/services/user/services.toggle-admin.js +++ b/static/resources/js/services/user/services.toggle-admin.js @@ -12,9 +12,11 @@ return toggleAdmin; - function toggleAdmin(userId) { + function toggleAdmin(userId, enabled) { return $http - .put('/api/users/' + userId); + .put('/api/users/' + userId + '/sysadmin', { + 'has_admin_role' : enabled + }); } } diff --git a/views/project.htm b/views/project.htm index c05c0877d1..b382498773 100644 --- a/views/project.htm +++ b/views/project.htm @@ -27,7 +27,7 @@
// 'username' | tr //// 'role' | tr //// 'email' | tr //// 'registration_time' | tr //// 'operation' | tr //// 'username' | tr //// 'email' | tr //// 'registration_time' | tr //// 'operation' | tr //
//u.username//N/A //u.email// //u.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'// -    -    +    +   
- + @@ -36,7 +36,7 @@ - +
// 'project_name' | tr //// 'repositories' | tr //// 'role' | tr //// 'creation_time' | tr //// 'publicity' | tr //// 'project_name' | tr //// 'repositories' | tr //// 'role' | tr //// 'creation_time' | tr //// 'publicity' | tr //
//p.name// //p.repo_count////vm.getProjectRole(p.current_user_role_id)////vm.getProjectRole(p.current_user_role_id)// //p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//