From fc47226376aa63e6170079f818be9bb507c88b37 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 29 Nov 2016 09:03:28 +0100
Subject: [PATCH] OO-2391: reload the reference before removing it
---
.../olat/modules/openmeetings/manager/OpenMeetingsDAO.java | 4 +++-
.../openmeetings/ui/OpenMeetingsAdminRoomsController.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
index ef9acb75b5a..a0538e7fdc2 100644
--- a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
+++ b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
@@ -135,7 +135,9 @@ public class OpenMeetingsDAO {
}
public void delete(OpenMeetingsRoomReference ref) {
- dbInstance.getCurrentEntityManager().remove(ref);
+ OpenMeetingsRoomReference reloadedRef = dbInstance.getCurrentEntityManager()
+ .getReference(OpenMeetingsRoomReference.class, ref.getKey());
+ dbInstance.getCurrentEntityManager().remove(reloadedRef);
}
public String serializeRoom(OpenMeetingsRoom room) {
diff --git a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
index 6fa1f42f1e1..2b709cec0e1 100644
--- a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
+++ b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsAdminRoomsController.java
@@ -193,7 +193,7 @@ public class OpenMeetingsAdminRoomsController extends BasicController {
protected void confirmDelete(UserRequest ureq, OpenMeetingsRoom room) {
String title = translate("delete");
- String text = translate("delete.confirm", new String[]{ room.getName() });
+ String text = translate("delete.confirm", new String[]{ StringHelper.escapeHtml(room.getName()) });
dialogCtr = activateOkCancelDialog(ureq, title, text, dialogCtr);
dialogCtr.setUserObject(room);
}
--
GitLab