diff --git a/src/main/java/de/jottyfan/camporganizer/module/common/IndexController.java b/src/main/java/de/jottyfan/camporganizer/module/common/IndexController.java index 4110031..ba29166 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexController.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexController.java @@ -45,6 +45,7 @@ public class IndexController extends CommonController { model.addAttribute("mybookings", service.getBookingsOf(super.getCurrentUser(request))); model.addAttribute("bookingBean", new BookingBean()); model.addAttribute("keycloakProfileUrl", keycloak.getUserClientUrl()); + model.addAttribute("camps", service.getAllCamps()); return "/dashboard"; } diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationBean.java b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationBean.java index f5c3628..9a76c74 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationBean.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationBean.java @@ -5,7 +5,6 @@ import java.time.LocalDate; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import org.springframework.format.annotation.DateTimeFormat; @@ -46,7 +45,6 @@ public class RegistrationBean implements Serializable { private Integer fkCamp; @NotNull(message = "Bitte gib an, in welcher Rolle du dich anmelden möchtest.") private EnumCamprole campRole; - @NotNull(message = "Bitte gib an, ob du dir für spätere Anmeldungen einen Zugang einrichten willst.") private Boolean registerInKeycloak; private String login; private String password; diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationController.java b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationController.java index b3faca5..dd67c19 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationController.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationController.java @@ -48,7 +48,7 @@ public class RegistrationController extends CommonController { model.addAttribute("camp", campBean); return "/registration/registration"; } - Boolean result = service.register(bean, getCurrentUser(request)); + Boolean result = service.register(bean, (String) model.getAttribute("currentUser")); return result ? "/registration/success" : "/error"; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 81d2509..6e06c2f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,3 +20,4 @@ ow.keycloak.admin.password = ${ow.keycloak.admin.password} # for development only server.port = 8081 + diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index d667d4c..92db3c1 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -10,10 +10,19 @@
  • Profil
    • -