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

Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users

Browse Source 
Fix group search number of users
This commit is contained in:
Christoph
2020-03-25 14:48:26 +01:00
committed by GitHub
parent 0e7f1d6865 22ae8a81dc
commit 74038428df
6 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,12 +199,14 @@ public class WebController {
Model model,
@RequestParam(value = "suchbegriff", required = false) String search) throws EventException {
Account account = keyCloakService.createAccountFromPrincipal(token);
List<Group> groupse = new ArrayList<>();
List<Group> groups = new ArrayList<>();
if (search != null) {
groupse = groupService.findGroupWith(search, account);
groups = groupService.findGroupWith(search, account);
}
model.addAttribute("account", account);
model.addAttribute("gruppen", groupse);
model.addAttribute("gruppen", groups);
return "search";
}