Skip to content
Snippets Groups Projects
Commit fc472263 authored by srosse's avatar srosse
Browse files

OO-2391: reload the reference before removing it

parent 8855787f
No related branches found
No related tags found
No related merge requests found
...@@ -135,7 +135,9 @@ public class OpenMeetingsDAO { ...@@ -135,7 +135,9 @@ public class OpenMeetingsDAO {
} }
public void delete(OpenMeetingsRoomReference ref) { 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) { public String serializeRoom(OpenMeetingsRoom room) {
......
...@@ -193,7 +193,7 @@ public class OpenMeetingsAdminRoomsController extends BasicController { ...@@ -193,7 +193,7 @@ public class OpenMeetingsAdminRoomsController extends BasicController {
protected void confirmDelete(UserRequest ureq, OpenMeetingsRoom room) { protected void confirmDelete(UserRequest ureq, OpenMeetingsRoom room) {
String title = translate("delete"); 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 = activateOkCancelDialog(ureq, title, text, dialogCtr);
dialogCtr.setUserObject(room); dialogCtr.setUserObject(room);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment