Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

make menu of registered roles more convenient, due to #36

Browse Source
This commit is contained in:
Jottyfan
2023-03-19 21:54:53 +01:00
parent 821b347fdb
commit bc7cd88c2f
16 changed files with 43 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/de/jottyfan/camporganizer/module/admin/AdminController.java
View File

@@ -35,17 +35,6 @@ public class AdminController extends CommonController {
@Value("${spring.mail.username}")
private String from;
@GetMapping("/admin")
public String getMain(Model model, HttpServletRequest request) {
super.setupSession(model, request);
return "/admin/main";
}
@GetMapping("/admin/main")
public String getMainDirectly() {
return "redirect:/admin/main";
}
@GetMapping("/admin/mail")
public String getMail(Model model, HttpServletRequest request) {
super.setupSession(model, request);
@@ -66,7 +55,7 @@ public class AdminController extends CommonController {
return "/admin/mail";
}
service.sendMail(bean);
return "redirect:/admin";
return "redirect:/admin/mail";
}
@GetMapping("/admin/document")
@@ -138,8 +127,10 @@ public class AdminController extends CommonController {
final BindingResult bindingResult, Model model, HttpServletRequest request) {
super.setupSession(model, request);
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors())
for (ObjectError error : bindingResult.getAllErrors()) {
LOGGER.error("error {}: {}", error.getCode(), error.getDefaultMessage());
}
model.addAttribute("documents", service.getLocationDocuments());
return "/admin/location_edit";
}
service.upsertLocation(bean);