OO-1410: remove recording allowed

src/main/java/org/olat/collaboration/CollaborationTools.java

@@ -641,7 +641,7 @@ public class CollaborationTools implements Serializable {
 			room.setComment(ores.getDescription());
 			room.setModerated(true);
 			room.setName(ores.getName());
-			room.setRecordingAllowed(true);
+			room.setAudioOnly(true);
 			room.setResourceName(ores.getName());
 			room.setSize(25);
 			room.setType(RoomType.conference.type());

src/main/java/org/olat/course/nodes/openmeetings/OpenMeetingsEditController.java

@@ -55,7 +55,6 @@ public class OpenMeetingsEditController extends ActivateableTabbableDefaultContr
 	public static final String CONFIG_ROOM_NAME = "roomName";
 	public static final String CONFIG_ROOM_SIZE = "roomSize";
 	public static final String CONFIG_ROOM_MODERATION = "roomModeration";
-	public static final String CONFIG_ROOM_RECORDING = "roomRecording";
 	public static final String CONFIG_ROOM_COMMENT = "roomComment";
 	public static final String CONFIG_ROOM_TYPE = "roomType";
 	public static final String CONFIG_ROOM_AUDIO_ONLY = "roomAudioOnly";
@@ -123,7 +122,6 @@ public class OpenMeetingsEditController extends ActivateableTabbableDefaultContr
 					moduleConfiguration.set(CONFIG_ROOM_NAME, room.getName());
 					moduleConfiguration.set(CONFIG_ROOM_SIZE, new Long(room.getSize()));
 					moduleConfiguration.set(CONFIG_ROOM_MODERATION, new Boolean(room.isModerated()));
-					moduleConfiguration.set(CONFIG_ROOM_RECORDING, new Boolean(room.isRecordingAllowed()));
 					moduleConfiguration.set(CONFIG_ROOM_AUDIO_ONLY, new Boolean(room.isAudioOnly()));
 					moduleConfiguration.set(CONFIG_ROOM_COMMENT, room.getComment());
 					moduleConfiguration.set(CONFIG_ROOM_TYPE, new Long(room.getType()));
@@ -161,10 +159,6 @@ public class OpenMeetingsEditController extends ActivateableTabbableDefaultContr
 		else if (moderated == null) {
 			room.setModerated(true);
 		}
-		Object recording = moduleConfiguration.get(CONFIG_ROOM_RECORDING);
-		if(recording instanceof Boolean) {
-			room.setRecordingAllowed(((Boolean)recording).booleanValue());
-		}
 		Object comment = moduleConfiguration.get(CONFIG_ROOM_COMMENT);
 		if(comment instanceof String) {
 			room.setComment((String)comment);

src/main/java/org/olat/course/nodes/openmeetings/OpenMeetingsEditFormController.java

@@ -24,7 +24,6 @@ import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FormLink;
-import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.elements.StaticTextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
@@ -55,12 +54,9 @@ public class OpenMeetingsEditFormController extends FormBasicController {
 	private StaticTextElement roomNameEl, roomTypeEl, roomSizeEl;
 	private StaticTextElement moderationModeEl, roomCommentEl;
 	private StaticTextElement avModeEl;
-	private MultipleSelectionElement recordingEl;
 	private CloseableModalController cmc;
 	private OpenMeetingsRoomEditController editController;
 	
-	private final String[] recordingKeys = {"xx"};
-	
 	private final OLATResourceable course;
 	private final OpenMeetingsCourseNode courseNode;
 	private final OpenMeetingsManager openMeetingsManager;
@@ -105,9 +101,6 @@ public class OpenMeetingsEditFormController extends FormBasicController {
 		roomTypeEl = uifactory.addStaticTextElement("room.type", "room.type", "", formLayout);
 		roomSizeEl = uifactory.addStaticTextElement("room.size", "room.size", "", formLayout);
 		moderationModeEl = uifactory.addStaticTextElement("mod", "room.moderation.mode", "", formLayout);
-		String[] recordingValues = new String[]{ translate("room.recording.enabled") };
-		recordingEl = uifactory.addCheckboxesHorizontal("recording", "room.recording", formLayout, recordingKeys, recordingValues);
-		recordingEl.setEnabled(false);
 		avModeEl = uifactory.addStaticTextElement("avmode", "room.av.mode", "", formLayout);
 		roomCommentEl = uifactory.addStaticTextElement("room.comment", "room.comment", "", formLayout);
 
@@ -145,8 +138,6 @@ public class OpenMeetingsEditFormController extends FormBasicController {
 		}
 		moderationModeEl.setValue(modVal);
 		moderationModeEl.setVisible(hasRoom);
-		recordingEl.select(recordingKeys[0], hasRoom && room.isRecordingAllowed());
-		recordingEl.setVisible(hasRoom);
 		String avVal;
 		if(hasRoom) {
 			avVal = room.isAudioOnly() ? translate("room.av.audio") : translate("room.av.video");
@@ -155,7 +146,6 @@ public class OpenMeetingsEditFormController extends FormBasicController {
 		}
 		avModeEl.setValue(avVal);
 		avModeEl.setVisible(hasRoom);
-		if (hasRoom) avModeEl.setEnabled(false);
 		roomCommentEl.setValue(hasRoom ? room.getComment() : "");
 		roomCommentEl.setVisible(hasRoom);
 		editLink.setI18nKey(hasRoom ? "edit.room" : "create.room");

src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsManagerImpl.java

@@ -347,7 +347,6 @@ public class OpenMeetingsManagerImpl implements OpenMeetingsManager, UserDataDel
 			if(omRoom != null) {
 				room.setComment(omRoom.getComment());
 				room.setModerated(omRoom.isIsModeratedRoom());
-				room.setRecordingAllowed(omRoom.isAllowRecording());
 				room.setAudioOnly(omRoom.isIsAudioOnly());
 				room.setName(omRoom.getName());
 				room.setRoomId(omRoom.getRoomsId());
@@ -480,7 +479,7 @@ public class OpenMeetingsManagerImpl implements OpenMeetingsManager, UserDataDel
 			long returned = roomWs.addRoomWithModerationAndRecordingFlags(sid,
 					room.getName(), room.getType(), room.getComment(), room.getSize(), false, false,
 					false, 0, room.isModerated(), getOpenOLATExternalType(), true,
-					room.isAudioOnly(), false, room.isRecordingAllowed());
+					room.isAudioOnly(), false, true);
 			if(returned >= 0) {
 				room.setRoomId(returned);
 				log.audit("Room created");

src/main/java/org/olat/modules/openmeetings/model/OpenMeetingsRoom.java

@@ -35,7 +35,6 @@ public class OpenMeetingsRoom {
 	private long size;
 	private boolean moderated;
 	private boolean audioOnly;
-	private boolean recordingAllowed;
 	private boolean closed;
 	
 	private transient OpenMeetingsRoomReference reference;
@@ -106,14 +105,6 @@ public class OpenMeetingsRoom {
 		this.audioOnly = audioOnly;
 	}
 	
-	public boolean isRecordingAllowed() {
-		return recordingAllowed;
-	}
-	
-	public void setRecordingAllowed(boolean recordingAllowed) {
-		this.recordingAllowed = recordingAllowed;
-	}
-
 	public OpenMeetingsRoomReference getReference() {
 		return reference;
 	}

src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsRoomEditController.java

@@ -26,7 +26,6 @@ import java.util.List;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
@@ -55,13 +54,11 @@ public class OpenMeetingsRoomEditController extends FormBasicController {
 	private SingleSelection roomSizeEl;
 	private SingleSelection avModeEl;
 	private SingleSelection moderationModeEl;
-	private MultipleSelectionElement recordingEl;
 	private TextElement commentEl;
 	
 	private final String[] roomTypeKeys;
 	private final String[] roomSizes;
 	private final String[] moderationModeKeys;
-	private final String[] recordingKeys = {"xx"};
 	private final String[] avModeKeys;
 
 	private final BusinessGroup group;
@@ -174,19 +171,11 @@ public class OpenMeetingsRoomEditController extends FormBasicController {
 			moderationModeEl.select(key, true);
 		}
 
-		String[] recordingValues = new String[]{ translate("room.recording.enabled") };
-		recordingEl = uifactory.addCheckboxesHorizontal("recording", "room.recording", formLayout, recordingKeys, recordingValues);
-		if(room != null) {
-			recordingEl.select(recordingKeys[0], room.isRecordingAllowed());
-		} else if(defaultSettings != null) {
-			recordingEl.select(recordingKeys[0], defaultSettings.isRecordingAllowed());
-		}
 		String[] avModeValues = new String[]{ translate("room.av.audio"), translate("room.av.video") };
 		avModeEl = uifactory.addDropdownSingleselect("avmode", "room.av.mode", formLayout, avModeKeys, avModeValues, null);
 		if(room != null) {
 			String key = room.isAudioOnly() ? avModeKeys[0] : avModeKeys[1];
 			avModeEl.select(key, true);
-			avModeEl.setEnabled(false);
 		} else if(defaultSettings != null) {
 			String key = defaultSettings.isAudioOnly() ? avModeKeys[0] : avModeKeys[1];
 			avModeEl.select(key, true);
@@ -215,7 +204,6 @@ public class OpenMeetingsRoomEditController extends FormBasicController {
 		room.setComment(commentEl.getValue());
 		room.setModerated(moderationModeEl.isOneSelected() && moderationModeEl.isSelected(0));
 		room.setName(roomNameEl.getValue());
-		room.setRecordingAllowed(recordingEl.isAtLeastSelected(1));
 		if(roomSizeEl.isOneSelected()) {
 			String key = roomSizeEl.getSelectedKey();
 			if(StringHelper.isLong(key)) {