diff --git a/pom.xml b/pom.xml index 3e5972cbae..42018f99dc 100755 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <!-- Dependency versions --> <slf4j.version>2.0.7</slf4j.version> <log4j2.version>2.20.0</log4j2.version> - <wicket.version>10.1.0</wicket.version> + <wicket.version>10.4.0</wicket.version> <!-- See https://hibernate.org/orm/releases/ for which version Hibernate implements --> <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version> diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java index 986d509685..a7e48a1f1c 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/ReflectionModalBodyPanel.java @@ -178,7 +178,13 @@ class ReflectionModalBodyPanel extends Panel { public SupervisorEditReflectionForm(String id, IModel<Reflection> reflectionModel) { super(id, reflectionModel); - IModel<String> reflectionTextModel = new Model<>(getReflectionText(reflectionModel.getObject())); + IModel<String> reflectionTextModel = new Model<>(); + Reflection reflection = reflectionModel.getObject(); + if (reflection instanceof Reflection.Submitted submitted) { + reflectionTextModel.setObject(submitted.reflection()); + } else if (reflection instanceof Reflection.ImprovementsNeeded improvementsNeeded) { + reflectionTextModel.setObject(improvementsNeeded.oldReflection()); + } TextArea<String> reflectionTextArea = new TextArea<>("reflection", reflectionTextModel); reflectionTextArea.setRequired(true);