Repository: openmeetings Updated Branches: refs/heads/master 663fe6a91 -> 0e7d08033
[OPENMEETINGS-1671] mic status is hidden by default Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0e7d0803 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0e7d0803 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0e7d0803 Branch: refs/heads/master Commit: 0e7d0803393f65e4da7d5ad048710cec918db55a Parents: 663fe6a Author: Maxim Solodovnik <[email protected]> Authored: Tue Sep 26 14:40:52 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Sep 26 14:40:52 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/admin/rooms/RoomForm.java | 6 +++--- .../org/apache/openmeetings/web/admin/rooms/RoomsPanel.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0e7d0803/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 44d6878..879758a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -119,7 +119,7 @@ public class RoomForm extends AdminBaseForm<Room> { private IModel<Long> wbIdx = Model.of(0L); public RoomForm(String id, WebMarkupContainer roomList, final Room room) { - super(id, new CompoundPropertyModel<>(room)); + super(id, new CompoundPropertyModel<>(room == null ? newRoom() : room)); this.roomList = roomList; setOutputMarkupId(true); } @@ -450,7 +450,7 @@ public class RoomForm extends AdminBaseForm<Room> { // TODO Auto-generated method stub } - private Room newRoom() { + private static Room newRoom() { Room r = new Room(); r.setHiddenElements(new HashSet<>(Arrays.asList(RoomElement.MicrophoneStatus))); return r; @@ -488,7 +488,7 @@ public class RoomForm extends AdminBaseForm<Room> { protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) { getBean(RoomDao.class).delete(getModelObject(), getUserId()); target.add(roomList); - setModelObject(new Room()); + setModelObject(newRoom()); updateView(target); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0e7d0803/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java index 9027c9c..cd73387 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java @@ -86,6 +86,6 @@ public class RoomsPanel extends AdminBasePanel { add(container.getLinks()); add(navigator); - add(form = new RoomForm("form", listContainer, new Room())); + add(form = new RoomForm("form", listContainer, null)); } }
