You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/09 03:43:25 UTC
openmeetings git commit: [OPENMEETINGS-1718] microphone status is
hidden for user private rooms
Repository: openmeetings
Updated Branches:
refs/heads/master c95111c1f -> 67686134b
[OPENMEETINGS-1718] microphone status is hidden for user private rooms
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/67686134
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/67686134
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/67686134
Branch: refs/heads/master
Commit: 67686134ba453294725ac2f8e4f698cd62ccf07e
Parents: c95111c
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 9 10:43:17 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 9 10:43:17 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/db/dao/room/RoomDao.java | 2 ++
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 6 +++---
.../java/org/apache/openmeetings/web/admin/rooms/RoomForm.java | 3 +--
.../openmeetings/web/user/calendar/AppointmentDialog.java | 2 ++
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67686134/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 971309a..6ebc941 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
@@ -43,6 +43,7 @@ import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.log.ConferenceLog;
import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.Room.Type;
import org.apache.openmeetings.db.entity.room.RoomFile;
import org.apache.openmeetings.db.util.TimezoneUtil;
@@ -268,6 +269,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
room.setAllowUserQuestions(true);
room.setOwnerId(ownerId);
room.setAllowRecording(true);
+ room.hide(RoomElement.MicrophoneStatus);
room = update(room, ownerId);
if (room.getId() != null) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67686134/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index a7bbff2..46f0863 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -31,15 +31,15 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
import static org.apache.openmeetings.util.OmFileHelper.FILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT;
import static org.apache.openmeetings.util.OmFileHelper.PROFILES_DIR;
+import static org.apache.openmeetings.util.OmFileHelper.PROFILES_PREFIX;
+import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME;
+import static org.apache.openmeetings.util.OmFileHelper.THUMB_IMG_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.getFileName;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadFilesDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir;
-import static org.apache.openmeetings.util.OmFileHelper.PROFILES_PREFIX;
-import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME;
-import static org.apache.openmeetings.util.OmFileHelper.THUMB_IMG_PREFIX;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_FIRST_DAY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67686134/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 ac4eaa3..6bbd85c 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
@@ -27,7 +27,6 @@ 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;
@@ -452,7 +451,7 @@ public class RoomForm extends AdminBaseForm<Room> {
private static Room newRoom() {
Room r = new Room();
- r.setHiddenElements(new HashSet<>(Arrays.asList(RoomElement.MicrophoneStatus)));
+ r.hide(RoomElement.MicrophoneStatus);
return r;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/67686134/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 1bad322..ebebd50 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -44,6 +44,7 @@ import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
@@ -430,6 +431,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private Room createAppRoom() {
Room r = new Room();
r.setAppointment(true);
+ r.hide(RoomElement.MicrophoneStatus);
if (r.getType() == null) {
r.setType(Room.Type.conference);
}