cannot remove the admin role from he admin user

This commit is contained in:
Athou
2013-03-31 09:04:30 +02:00
parent 857b65f2b2
commit 5b36df1ab3
2 changed files with 7 additions and 0 deletions

View File

@@ -67,6 +67,12 @@ public class AdminUsersREST extends AbstractREST {
if (userModel.isAdmin() && !roles.contains(Role.ADMIN)) {
userRoleService.save(new UserRole(user, Role.ADMIN));
} else if (!userModel.isAdmin() && roles.contains(Role.ADMIN)) {
if (StartupBean.ADMIN_NAME.equals(user.getName())) {
return Response
.status(Status.FORBIDDEN)
.entity("You cannot remove the admin role from the admin user.")
.build();
}
for (UserRole userRole : userRoleService.findAll(user)) {
if (userRole.getRole() == Role.ADMIN) {
userRoleService.delete(userRole);

View File

@@ -293,6 +293,7 @@ module.controller('ManageUserCtrl', function($scope, $state, $stateParams,
$state.transitionTo('admin.userlist');
}
$scope.save = function() {
$scope.alerts.splice(0, $scope.alerts.length);
AdminUsersService.save($scope.user, function() {
$state.transitionTo('admin.userlist');
}, alertFunction);