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

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

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/resources/templates/editMembers.html
This commit is contained in:
Lukas Ettel
2020-03-19 16:14:57 +01:00
parent cf46a549dc d9388c282c
commit a96981515f
10 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -164,6 +164,7 @@ public class Gruppen2Controller {
@PostMapping("/detailsBeitreten")
public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam("id") Long groupId) throws EventException {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
Account account = keyCloakService.createAccountFromPrincipal(token);
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
Group group = userService.getGroupById(groupId);