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

Fix Group Search

Browse Source 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
This commit is contained in:
XXNitram
2020-03-24 16:59:45 +01:00
parent 439bd78b5c
commit 9954f685f5
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,12 +224,12 @@ public class Gruppen2Controller {
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", keyCloakService.createAccountFromPrincipal(token));
model.addAttribute("gruppen", groupse);
model.addAttribute("gruppen", groups);
return "search";
}
@ -302,18 +302,17 @@ public class Gruppen2Controller {
UUID parentId = group.getParent();
Group parent = new Group();
/**
* Fix this please!!!
if (parentId != null) {
parent = userService.getGroupById(parentId);
}
}*/
if (group.getUserMaximum() > group.getMembers().size()) {
model.addAttribute("group", group);
model.addAttribute("parentId", parentId);
model.addAttribute("parent", parent);
model.addAttribute("group", group);
model.addAttribute("parentId", parentId);
model.addAttribute("parent", parent);
return "detailsNoMember";
}
throw new GroupNotFoundException(this.getClass().toString());
return "detailsNoMember";
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})