Repository: openmeetings Updated Branches: refs/heads/master e42da7ca5 -> 41c56de1d
[OPENMEETINGS-1671] room form is fixed, user form is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/41c56de1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/41c56de1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/41c56de1 Branch: refs/heads/master Commit: 41c56de1d9c511363a58a5e2aa3364c0e0168fb1 Parents: e42da7c Author: Maxim Solodovnik <[email protected]> Authored: Tue Sep 26 14:30:27 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Sep 26 14:30:27 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/db/dao/room/RoomDao.java | 4 ++-- .../java/org/apache/openmeetings/web/admin/users/UserForm.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/41c56de1/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 77ec762..8955ea9 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 @@ -87,7 +87,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { q.setParameter("id", id); @SuppressWarnings("unchecked") OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q); - kq.getFetchPlan().addFetchGroups("roomModerators", "groups", "files"); + kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups", "roomFiles"); List<Room> l = kq.getResultList(); r = l.isEmpty() ? r : l.get(0); } finally { @@ -107,7 +107,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { TypedQuery<Room> q = oem.createNamedQuery("getBackupRooms", Room.class); @SuppressWarnings("unchecked") OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q); - kq.getFetchPlan().addFetchGroups("roomModerators", "groups", "files"); + kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups", "roomFiles"); return kq.getResultList(); } finally { oem.getFetchPlan().setQueryResultCacheEnabled(qrce); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/41c56de1/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index ff139d0..a1efce0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -195,7 +195,7 @@ public class UserForm extends AdminBaseForm<User> { // FIXME update feedback with the error details log.error("[onSaveSubmit]: ", e); } - setModelObject(u); + setModelObject(getBean(UserDao.class).get(u.getId())); hideNewRecord(); target.add(this); target.add(listContainer);
