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

Merge remote-tracking branch 'origin/master' into JavaDocComments

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
[Mahgs]
2020-03-27 15:29:50 +01:00
parent d0114a5a58 a293cb1935
commit 3650561123
9 changed files with 437 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,8 +280,6 @@ public class WebController {
validationService.checkGroup(group.getTitle());
model.addAttribute("group", group);
//controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), group.getId());
if (group.getVisibility() == Visibility.PUBLIC) {
return "redirect:/gruppen2/details/" + group.getId();
}
@ -299,7 +297,7 @@ public class WebController {
User user = new User(acc.getName(), acc.getGivenname(), acc.getFamilyname(), acc.getEmail());
if (!validationService.checkIfUserInGroup(userService.getGroupById(UUID.fromString(groupId)), user)) {
if (!validationService.checkIfUserInGroupWithoutNoAccessAcception(userService.getGroupById(UUID.fromString(groupId)), user)) {
controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));
}