christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge with master

Browse Source 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
This commit is contained in:
XXNitram
2020-03-27 15:55:23 +01:00
parent bf122457c2
commit 59e9ff4d4d
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/controller/WebController.java
View File

@ -311,7 +311,7 @@ public class WebController {
User user = new User(acc.getName(), acc.getGivenname(), acc.getFamilyname(), acc.getEmail());
if (!validationService.checkIfUserInGroupWithoutNoAccessAcception(userService.getGroupById(UUID.fromString(groupId)), user)) {
if (!validationService.checkIfUserInGroup(userService.getGroupById(UUID.fromString(groupId)), user)) {
controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));
}

2
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -259,7 +259,7 @@ public class ControllerService {
eventService.saveEvent(deleteGroupEvent);
}
private void changeRoleIfLastAdmin(Account account, Group group) {
public void changeRoleIfLastAdmin(Account account, Group group) {
if (group.getMembers().size() <= 1) {
return;
}