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

Merge remote-tracking branch 'origin/edit-User' into edit-User

Browse Source 
# Conflicts:
#	src/main/resources/templates/editMembers.html
This commit is contained in:
kasch309
2020-03-18 14:23:27 +01:00
parent b89b47ec81 45679c7d2a
commit 3b09d2a3a2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -30,3 +30,5 @@ out/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
.floo
.flooignore

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

@ -125,6 +125,9 @@ public class Gruppen2Controller {
public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException { public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
Account 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(id);
if(group.getMembers().contains(user)) return "errorRenameLater"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden
controllerService.addUser(account,id); controllerService.addUser(account,id);
return "redirect:/gruppen2/"; return "redirect:/gruppen2/";
} }