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

Merge remote-tracking branch 'origin/showInviteLink' into showInviteLink

Browse Source 
# Conflicts:
#	src/main/resources/templates/detailsMember.html
This commit is contained in:
Lukas Ettel
2020-03-23 16:54:20 +01:00
parent 6fc0cafc61 a03d3f5b69
commit 14d657131a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,8 @@ public class Gruppen2Controller {
private final Gruppen2Config gruppen2Config;
private final Logger logger;
private final String serverURL = "localhost:8080";
public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) {
this.keyCloakService = keyCloakService;
this.groupService = groupService;
@ -200,7 +202,7 @@ public class Gruppen2Controller {
model.addAttribute("user", user);
model.addAttribute("admin", Role.ADMIN);
String link = inviteLinkRepositoryService.findlinkByGroupId(group.getId());
String link = serverURL + "/gruppen2/acceptinvite/" + inviteLinkRepositoryService.findlinkByGroupId(group.getId());
model.addAttribute("link", link);
String port ="";