132133134135136137138139140141142
// grant/revoke admin role if needed if (getUser().hasRole("admin") && !getBean().isAdministrator()) { if (!isUserEditingSelf()) { // revoke role mgr.revokeRole("admin", getUser()); } else { addError("userAdmin.cantChangeOwnRole"); } } else if(!getUser().hasRole("admin") && getBean().isAdministrator()) {
189190191192193194195196197198199
assertEquals(2, user.getRoles().size()); assertTrue(user.hasRole("editor")); assertTrue(user.hasRole("admin")); // remove role mgr.revokeRole("admin",user); mgr.saveUser(user); TestUtils.endSession(true); // check that role was removed user = null;
144145146147148149150151152153154
// grant/revoke admin role if needed if (hasAdmin && !getBean().isAdministrator()) { if (!isUserEditingSelf()) { // revoke role mgr.revokeRole("admin", getUser()); } else { addError("userAdmin.cantChangeOwnRole"); } } else if(!hasAdmin && getBean().isAdministrator()) {