1

Merge remote-tracking branch 'origin/master' into updateGroupsAPI

# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
This commit is contained in:
LukasEttel
2020-03-13 13:52:53 +01:00
11 changed files with 73 additions and 34 deletions

View File

@ -80,7 +80,7 @@ public class Gruppen2Controller {
Account account = keyCloakService.createAccountFromPrincipal(token);
controllerService.createGroup(account, title, beschreibung);
return "redirect:/gruppen2";
return "redirect:/gruppen2/";
}
}

View File

@ -0,0 +1,13 @@
package mops.gruppen2.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@Controller
public class MopsController {
@GetMapping("")
public String redirect(){
return "redirect:/gruppen2/";
}
}