Repository: openmeetings Updated Branches: refs/heads/3.3.x fc1e12385 -> 44a748925
[OPENMEETINGS-1718] mic status is hidden by default for the new rooms Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/44a74892 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/44a74892 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/44a74892 Branch: refs/heads/3.3.x Commit: 44a748925bf62a5e16bbe29d25f96a376bd18630 Parents: fc1e123 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 9 09:25:39 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 9 09:25:39 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/admin/rooms/RoomForm.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/44a74892/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 7398418..f62a798 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 @@ -28,6 +28,7 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; @@ -120,7 +121,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); } @@ -451,9 +452,15 @@ public class RoomForm extends AdminBaseForm<Room> { // TODO Auto-generated method stub } + private static Room newRoom() { + Room r = new Room(); + r.setHiddenElements(new HashSet<>(Arrays.asList(RoomElement.MicrophoneStatus))); + return r; + } + @Override protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) { - setModelObject(new Room()); + setModelObject(newRoom()); updateView(target); } @@ -468,7 +475,7 @@ public class RoomForm extends AdminBaseForm<Room> { if (r.getId() != null) { r = getBean(RoomDao.class).get(r.getId()); } else { - r = new Room(); + r = newRoom(); } setModelObject(r); updateView(target); @@ -483,7 +490,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); }
