Repository: openmeetings Updated Branches: refs/heads/master 89d7abc88 -> 1c3f765ee
[OPENMEETINGS-1720] WB undo is fixed, code clean-up Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1c3f765e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1c3f765e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1c3f765e Branch: refs/heads/master Commit: 1c3f765ee0c7f5c44ca5010ca6d8418f1a5cead7 Parents: 89d7abc Author: Maxim Solodovnik <[email protected]> Authored: Sat Oct 14 11:41:16 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Oct 14 11:41:16 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/db/dao/room/RoomDao.java | 3 +-- .../openmeetings/db/dto/room/Whiteboard.java | 7 +++++-- .../openmeetings/db/entity/room/RoomGroup.java | 21 +------------------- 3 files changed, 7 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c3f765e/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index ab05ec2..4625a15 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -322,7 +322,6 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { } public List<RoomGroup> getGroups() { - return em.createQuery("SELECT rg FROM RoomGroup rg", RoomGroup.class) - .getResultList(); + return em.createNamedQuery("getAllRoomGroups", RoomGroup.class).getResultList(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c3f765e/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java index 404d409..8fbdf20 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java @@ -195,9 +195,12 @@ public class Whiteboard implements Serializable { for (Entry<String, String> e : roomItems.entrySet()) { JSONObject o = new JSONObject(e.getValue()); //filtering - o.remove("src"); if ("Clipart".equals(o.opt("omType"))) { - o.put("src", o.get("_src")); + if (o.has("_src")) { + o.put("src", o.get("_src")); + } + } else { + o.remove("src"); } o.remove("_src"); items.put(e.getKey(), o); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1c3f765e/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java index ec9c655..93f9bd2 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java @@ -38,26 +38,7 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name = "getAllRoomGroups", query = "select ro from RoomGroup ro ORDER BY ro.id"), - @NamedQuery(name = "getRoomGroupByGroupIdAndRoomType", query = "select c from RoomGroup as c " - + "where c.room.type = :type AND c.group.id = :groupId " - + "AND c.deleted = false"), - @NamedQuery(name = "getRoomGroupByGroupId", query = "SELECT c FROM RoomGroup c " - + "LEFT JOIN FETCH c.room " - + "WHERE c.group.id = :groupId " - + "AND c.deleted = false AND c.room.deleted = false AND c.room.appointment = false " - + "AND c.group.deleted = false " - + "ORDER BY c.room.name ASC"), - @NamedQuery(name = "selectMaxFromRoomsByGroup", query = "select c from RoomGroup as c " - + "where c.group.id = :groupId " - + "AND c.deleted = false"), - @NamedQuery(name = "getRoomGroupByGroupIdAndRoomId", query = "select c from RoomGroup as c " - + "where c.room.id = :roomId " - + "AND c.group.id = :groupId " - + "AND c.deleted = false"), - @NamedQuery(name = "getRoomGroupByRoomsId", query = "select c from RoomGroup as c " - + "where c.room.id = :roomId " - + "AND c.deleted = false") + @NamedQuery(name = "getAllRoomGroups", query = "SELECT rg FROM RoomGroup rg ORDER BY rg.id") }) @Table(name = "room_group") @Root(name="room_organisation")
