booking module on dashboard added
This commit is contained in:
@@ -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";
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user