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

fix entering group youre already part of

Browse Source
This commit is contained in:
killerber4t
2020-03-18 14:11:52 +01:00
parent 19e8ef9c07
commit 56f82203cd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/";
} }

2
src/main/resources/templates/editMembers.html
View File

@ -38,7 +38,7 @@
</tr> </tr>
</thead> </thead>
<tr th:each="member : ${group.getMembers()}"> <tr th:each="member : ${group.getMembers()}">
<th th:value="${member.getUser_id()}"></th> <th th:text="${member.getUser_id()}"></th>
<th ></th> <th ></th>
<th> <th>
<button class="btn btn-warning">Rolle ändern</button> <!-- th:if --> <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->