diff --git a/src/main/java/org/olat/course/nodes/OpencastCourseNode.java b/src/main/java/org/olat/course/nodes/OpencastCourseNode.java
index 0a068c314e10983cd95f263b527e1a25c56b8f6a..a043fb5bb497b3d3f0dfdc243bbb190e4bbb7424 100644
--- a/src/main/java/org/olat/course/nodes/OpencastCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/OpencastCourseNode.java
@@ -36,8 +36,8 @@ import org.olat.course.editor.ConditionAccessEditConfig;
import org.olat.course.editor.CourseEditorEnv;
import org.olat.course.editor.NodeEditController;
import org.olat.course.editor.StatusDescription;
-import org.olat.course.nodes.opencast.ui.OpencastDisplayController;
import org.olat.course.nodes.opencast.ui.OpencastEditController;
+import org.olat.course.nodes.opencast.ui.OpencastRunController;
import org.olat.course.run.navigation.NodeRunConstructionResult;
import org.olat.course.run.userview.CourseNodeSecurityCallback;
import org.olat.course.run.userview.UserCourseEnvironment;
@@ -95,7 +95,7 @@ public class OpencastCourseNode extends AbstractAccessableCourseNode {
String message = trans.translate("freezenoaccess.message");
runCtrl = MessageUIFactory.createInfoMessage(ureq, wControl, title, message);
} else {
- runCtrl = new OpencastDisplayController(ureq, wControl, this, userCourseEnv);
+ runCtrl = new OpencastRunController(ureq, wControl, this, userCourseEnv);
}
Controller ctrl = TitledWrapperHelper.getWrapper(ureq, wControl, runCtrl, this, ICON_CSS);
return new NodeRunConstructionResult(ctrl);
diff --git a/src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java b/src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java
index 89324e6bd72abc0cc5ec0c8aafd35a9393fb5d6b..b21826094da16d49f72c6ade713d81b462e2ee9a 100644
--- a/src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java
+++ b/src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java
@@ -37,12 +37,8 @@ import org.olat.core.util.StringHelper;
import org.olat.course.editor.NodeEditController;
import org.olat.course.nodes.OpencastCourseNode;
import org.olat.modules.ModuleConfiguration;
-import org.olat.modules.opencast.OpencastEvent;
import org.olat.modules.opencast.OpencastEventProvider;
-import org.olat.modules.opencast.OpencastSeries;
import org.olat.modules.opencast.OpencastSeriesProvider;
-import org.olat.modules.opencast.OpencastService;
-import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -67,9 +63,6 @@ public class OpencastConfigController extends FormBasicController {
private final ModuleConfiguration config;
- @Autowired
- private OpencastService opencastService;
-
public OpencastConfigController(UserRequest ureq, WindowControl wControl, OpencastCourseNode courseNode) {
super(ureq, wControl);
config = courseNode.getModuleConfiguration();
@@ -88,10 +81,7 @@ public class OpencastConfigController extends FormBasicController {
String seriesIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_SERIES_IDENTIFIER, null);
String seriesTitle = null;
if (seriesIdentifier != null) {
- OpencastSeries series = opencastService.getSeries(seriesIdentifier);
- if (series != null) {
- seriesTitle = series.getTitle();
- }
+ seriesTitle = config.getStringValue(OpencastCourseNode.CONFIG_TITLE);
}
seriesEl = uifactory.addTextElementWithAutoCompleter("config.series", "config.series", 128, seriesTitle, formLayout);
seriesEl.setListProvider(new OpencastSeriesProvider(getIdentity(), MORE_KEY), ureq.getUserSession());
@@ -101,10 +91,7 @@ public class OpencastConfigController extends FormBasicController {
String eventIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_EVENT_IDENTIFIER, null);
String eventTitle = null;
if (eventIdentifier != null) {
- OpencastEvent event = opencastService.getEvent(eventIdentifier);
- if (event != null) {
- eventTitle = event.getTitle();
- }
+ eventTitle = config.getStringValue(OpencastCourseNode.CONFIG_TITLE);
}
eventEl = uifactory.addTextElementWithAutoCompleter("config.event", "config.event", 128, eventTitle, formLayout);
eventEl.setListProvider(new OpencastEventProvider(getIdentity(), MORE_KEY), ureq.getUserSession());
diff --git a/src/main/java/org/olat/course/nodes/opencast/ui/OpencastDisplayController.java b/src/main/java/org/olat/course/nodes/opencast/ui/OpencastDisplayController.java
deleted file mode 100644
index ab10be728203b3364347088f32abd610e54635f7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/opencast/ui/OpencastDisplayController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.course.nodes.opencast.ui;
-
-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.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
-import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.winmgr.CommandFactory;
-import org.olat.core.util.Formatter;
-import org.olat.course.nodes.OpencastCourseNode;
-import org.olat.course.run.userview.UserCourseEnvironment;
-import org.olat.modules.ModuleConfiguration;
-import org.olat.modules.opencast.OpencastEvent;
-import org.olat.modules.opencast.OpencastModule;
-import org.olat.modules.opencast.OpencastSeries;
-import org.olat.modules.opencast.OpencastService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- *
- * Initial date: 12 Aug 2020<br>
- * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
- *
- */
-public class OpencastDisplayController extends FormBasicController {
-
- private FormLink seriesButton;
- private FormLink eventButton;
-
- private final ModuleConfiguration config;
- private final String roles;
-
- @Autowired
- private OpencastModule opencastModule;
- @Autowired
- private OpencastService opencastService;
-
- public OpencastDisplayController(UserRequest ureq, WindowControl wControl, OpencastCourseNode courseNode,
- UserCourseEnvironment userCourseEnv) {
- super(ureq, wControl, "display");
- config = courseNode.getModuleConfiguration();
- roles = initRoles(userCourseEnv);
-
- initForm(ureq);
- doStartImmediately(ureq);
- }
-
- private String initRoles(UserCourseEnvironment userCourseEnv) {
- if (userCourseEnv.isAdmin()) {
- return opencastModule.getRolesAdmin();
- } else if (userCourseEnv.isCoach()) {
- return opencastModule.getRolesCoach();
- }
- return opencastModule.getRolesParticipant();
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
- if (formLayout instanceof FormLayoutContainer) {
- FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
-
- String title = config.getStringValue(OpencastCourseNode.CONFIG_TITLE);
- layoutCont.contextPut("title", title);
-
- if (config.has(OpencastCourseNode.CONFIG_SERIES_IDENTIFIER)) {
- String seriesIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_SERIES_IDENTIFIER);
- OpencastSeries series = opencastService.getSeries(seriesIdentifier);
- if (series != null) {
- layoutCont.contextPut("title", series.getTitle());
- seriesButton = uifactory.addFormLink("start.series", formLayout, Link.BUTTON_LARGE);
- seriesButton.setNewWindow(true, true);
- seriesButton.setUserObject(series);
- } else {
- layoutCont.contextPut("error", translate("error.series.not.found", new String[] {title}));
- }
- } else {
- String eventIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_EVENT_IDENTIFIER);
- OpencastEvent event = opencastService.getEvent(eventIdentifier);
- if (event != null) {
- layoutCont.contextPut("title", event.getTitle());
- String start = Formatter.getInstance(getLocale()).formatDateAndTime(event.getStart());
- layoutCont.contextPut("start", start);
- layoutCont.contextPut("creator", event.getCreator());
-
- eventButton = uifactory.addFormLink("start.event", formLayout, Link.BUTTON_LARGE);
- eventButton.setNewWindow(true, true);
- eventButton.setUserObject(event);
- } else {
- layoutCont.contextPut("error", translate("error.event.not.found", new String[] {title}));
- }
- }
- }
- }
-
- @Override
- protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
- if (source == seriesButton) {
- OpencastSeries opencastSeries = (OpencastSeries)seriesButton.getUserObject();
- doStartSeries(ureq, opencastSeries);
- } else if (source == eventButton) {
- OpencastEvent opencastEvent = (OpencastEvent)eventButton.getUserObject();
- doStartEvent(ureq, opencastEvent);
- }
- super.formInnerEvent(ureq, source, event);
- }
-
- private void doStartImmediately(UserRequest ureq) {
- if (opencastModule.isStartImmediately()) {
- if (seriesButton != null) {
- OpencastSeries opencastSeries = (OpencastSeries)seriesButton.getUserObject();
- doStartSeries(ureq, opencastSeries);
- } else if (eventButton != null) {
- OpencastEvent opencastEvent = (OpencastEvent)eventButton.getUserObject();
- doStartEvent(ureq, opencastEvent);
- }
- }
- }
-
- private void doStartSeries(UserRequest ureq, OpencastSeries opencastSeries) {
- String url = opencastService.getLtiSeriesMapperUrl(ureq.getUserSession(), opencastSeries, roles);
- getWindowControl().getWindowBackOffice().sendCommandTo(CommandFactory.createNewWindowRedirectTo(url));
- }
-
- private void doStartEvent(UserRequest ureq, OpencastEvent opencastEvent) {
- String url = opencastService.getLtiEventMapperUrl(ureq.getUserSession(), opencastEvent.getIdentifier(), roles);
- getWindowControl().getWindowBackOffice().sendCommandTo(CommandFactory.createNewWindowRedirectTo(url));
- }
-
- @Override
- protected void formOK(UserRequest ureq) {
- //
- }
-
- @Override
- protected void doDispose() {
- //
- }
-
-}
diff --git a/src/main/java/org/olat/course/nodes/opencast/ui/OpencastRunController.java b/src/main/java/org/olat/course/nodes/opencast/ui/OpencastRunController.java
new file mode 100644
index 0000000000000000000000000000000000000000..7078188e9c5094fc01972788c0fdd2099d8de52e
--- /dev/null
+++ b/src/main/java/org/olat/course/nodes/opencast/ui/OpencastRunController.java
@@ -0,0 +1,119 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.course.nodes.opencast.ui;
+
+import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.Component;
+import org.olat.core.gui.components.htmlheader.jscss.JSAndCSSComponent;
+import org.olat.core.gui.components.velocity.VelocityContainer;
+import org.olat.core.gui.control.Event;
+import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.util.Formatter;
+import org.olat.course.nodes.OpencastCourseNode;
+import org.olat.course.run.userview.UserCourseEnvironment;
+import org.olat.modules.ModuleConfiguration;
+import org.olat.modules.opencast.OpencastEvent;
+import org.olat.modules.opencast.OpencastModule;
+import org.olat.modules.opencast.OpencastSeries;
+import org.olat.modules.opencast.OpencastService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ *
+ * Initial date: 13 Aug 2020<br>
+ * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
+ *
+ */
+public class OpencastRunController extends BasicController {
+
+ private final ModuleConfiguration config;
+ private final String roles;
+
+ @Autowired
+ private OpencastModule opencastModule;
+ @Autowired
+ private OpencastService opencastService;
+
+ public OpencastRunController(UserRequest ureq, WindowControl wControl, OpencastCourseNode courseNode, UserCourseEnvironment userCourseEnv) {
+ super(ureq, wControl);
+ config = courseNode.getModuleConfiguration();
+ roles = initRoles(userCourseEnv);
+
+ VelocityContainer mainVC = createVelocityContainer("run");
+
+ String url = null;
+ String title = config.getStringValue(OpencastCourseNode.CONFIG_TITLE);
+ mainVC.contextPut("title", title);
+
+ if (config.has(OpencastCourseNode.CONFIG_SERIES_IDENTIFIER)) {
+ String seriesIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_SERIES_IDENTIFIER);
+ OpencastSeries series = opencastService.getSeries(seriesIdentifier);
+ if (series != null) {
+ mainVC.contextPut("title", series.getTitle());
+ url = opencastService.getLtiSeriesMapperUrl(ureq.getUserSession(), series, roles);
+ } else {
+ mainVC.contextPut("error", translate("error.series.not.found", new String[] {title}));
+ }
+ } else {
+ String eventIdentifier = config.getStringValue(OpencastCourseNode.CONFIG_EVENT_IDENTIFIER);
+ OpencastEvent event = opencastService.getEvent(eventIdentifier);
+ if (event != null) {
+ mainVC.contextPut("title", event.getTitle());
+ String start = Formatter.getInstance(getLocale()).formatDateAndTime(event.getStart());
+ mainVC.contextPut("start", start);
+ mainVC.contextPut("creator", event.getCreator());
+ url = opencastService.getLtiEventMapperUrl(ureq.getUserSession(), event.getIdentifier(), roles);
+ } else {
+ mainVC.contextPut("error", translate("error.event.not.found", new String[] {title}));
+ }
+ }
+
+ if (url != null) {
+ mainVC.contextPut("mapperUri", url + "/");
+
+ JSAndCSSComponent js = new JSAndCSSComponent("js", new String[] { "js/openolat/iFrameResizerHelper.js" }, null);
+ mainVC.put("js", js);
+ }
+
+ putInitialPanel(mainVC);
+ }
+
+ private String initRoles(UserCourseEnvironment userCourseEnv) {
+ if (userCourseEnv.isAdmin()) {
+ return opencastModule.getRolesAdmin();
+ } else if (userCourseEnv.isCoach()) {
+ return opencastModule.getRolesCoach();
+ }
+ return opencastModule.getRolesParticipant();
+ }
+
+
+ @Override
+ protected void event(UserRequest ureq, Component source, Event event) {
+ //
+ }
+
+ @Override
+ protected void doDispose() {
+ //
+ }
+
+}
diff --git a/src/main/java/org/olat/course/nodes/opencast/ui/_content/display.html b/src/main/java/org/olat/course/nodes/opencast/ui/_content/display.html
deleted file mode 100644
index dec36daf9114dfb1f88082b6cf718a3790808b63..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/opencast/ui/_content/display.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div>
-<h3>$r.escapeHtml($title)</h3>
-#if($r.isNotEmpty($errorMessage))
- <div class="o_error">$errorMessage</div>
-#end
-#if($r.isNotNull($start))
-<div><i class="o_icon o_icon-fw o_icon_lifecycle_date"> </i> $start</div>
-#end
-#if($r.isNotEmpty($creator))
-<div><i class="o_icon o_icon-fw o_icon_user"> </i> $r.escapeHtml($creator)</div>
-#end
-<div class="o_button_group">
-#if($r.available("start.series") && $r.visible("start.series"))
- $r.render("start.series")
-#end
-#if($r.available("start.event") && $r.visible("start.event"))
- $r.render("start.event")
-#end
-</div>
-</div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/opencast/ui/_content/run.html b/src/main/java/org/olat/course/nodes/opencast/ui/_content/run.html
new file mode 100644
index 0000000000000000000000000000000000000000..7eca555a3be17ed0c0335905c7f9e8ea278cf39f
--- /dev/null
+++ b/src/main/java/org/olat/course/nodes/opencast/ui/_content/run.html
@@ -0,0 +1,23 @@
+<div>
+<h3>$r.escapeHtml($title)</h3>
+#if($r.isNotEmpty($errorMessage))
+ <div class="o_error">$errorMessage</div>
+#end
+#if($r.isNotNull($start))
+ <div><i class="o_icon o_icon-fw o_icon_lifecycle_date"> </i> $start</div>
+#end
+#if($r.isNotEmpty($creator))
+ <div><i class="o_icon o_icon-fw o_icon_user"> </i> $r.escapeHtml($creator)</div>
+#end
+</div>
+#if($r.isNotNull($mapperUri))
+ <div class="o_iframedisplay">
+ <iframe id="OpencastIFrame" src="${mapperUri}?$r.uuid" marginwidth="0" marginheight="0" frameborder="0" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>
+ </div>
+ <script>
+ /* <![CDATA[ */
+ jQuery(function() {b_resizeIframeToMainMaxHeight("OpencastIFrame");});
+ registerIFrameAndObserve("OpencastIFrame", false);
+ /* ]]> */
+ </script>
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/opencast/OpencastModule.java b/src/main/java/org/olat/modules/opencast/OpencastModule.java
index afcf7e76211380de1f509f7cdd2f463234d95802..ddf3350efb1f101055425645b3a359f0a585cf3a 100644
--- a/src/main/java/org/olat/modules/opencast/OpencastModule.java
+++ b/src/main/java/org/olat/modules/opencast/OpencastModule.java
@@ -54,7 +54,6 @@ public class OpencastModule extends AbstractSpringModule implements ConfigOnOff
private static final String LTI_SECRET = "lti.secret";
private static final String BBB_ENABLED = "opencast.bbb.enabled";
private static final String COURSE_NODE_ENABLED = "opencast.course.node.enabled";
- private static final String START_IMMEDIATELY = "start.immediately";
private static final String ROLES_ADMIN = "roles.admin";
private static final String ROLES_COACH = "roles.coach";
private static final String ROLES_PARTICIPANT = "roles.participant";
@@ -81,8 +80,6 @@ public class OpencastModule extends AbstractSpringModule implements ConfigOnOff
private boolean bigBlueButtonEnabled;
@Value("${opencast.course.node.enabled}")
private boolean courseNodeEnabled;
- @Value("${opencast.course.node.start.immediately}")
- private boolean startImmediately;
@Value("${opencast.course.node.roles.admin}")
private String rolesAdmin;
@Value("${opencast.course.node.roles.coach}")
@@ -128,11 +125,6 @@ public class OpencastModule extends AbstractSpringModule implements ConfigOnOff
courseNodeEnabled = "true".equals(courseNodeEnabledObj);
}
- String startImmediatelyObj = getStringPropertyValue(START_IMMEDIATELY, true);
- if(StringHelper.containsNonWhitespace(startImmediatelyObj)) {
- startImmediately = "true".equals(startImmediatelyObj);
- }
-
rolesAdmin = getStringPropertyValue(ROLES_ADMIN, rolesAdmin);
rolesCoach = getStringPropertyValue(ROLES_COACH, rolesCoach);
rolesParticipant = getStringPropertyValue(ROLES_PARTICIPANT, rolesParticipant);
@@ -272,15 +264,6 @@ public class OpencastModule extends AbstractSpringModule implements ConfigOnOff
setStringProperty(COURSE_NODE_ENABLED, Boolean.toString(courseNodeEnabled), true);
}
- public boolean isStartImmediately() {
- return startImmediately;
- }
-
- public void setStartImmediately(boolean startImmediately) {
- this.startImmediately = startImmediately;
- setStringProperty(START_IMMEDIATELY, Boolean.toString(startImmediately), true);
- }
-
public String getRolesAdmin() {
return rolesAdmin;
}
diff --git a/src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java b/src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java
index abe3d05f1a08ced01e6b514f1f2489cb765e3ca0..20d3cc8a35eb774ad153e530bb2bc63e90cf53be 100644
--- a/src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java
+++ b/src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java
@@ -71,7 +71,6 @@ public class OpencastAdminController extends FormBasicController {
private MultipleSelectionElement courseNodeEnabledEl;
private SingleSelection authDelegateTypeEl;
private TextElement authDelegateRolesEl;
- private MultipleSelectionElement startImmediatelyEl;
private MultipleSelectionElement rolesAdminEl;
private MultipleSelectionElement rolesCoachEl;
private MultipleSelectionElement rolesParticipantEl;
@@ -146,7 +145,6 @@ public class OpencastAdminController extends FormBasicController {
authDelegateTypeEl.addActionListener(FormEvent.ONCHANGE);
authDelegateRolesEl = uifactory.addTextElement("admin.auth.delegate.roles", 128, null, formLayout);
authDelegateRolesEl.setMandatory(true);
- startImmediatelyEl = uifactory.addCheckboxesHorizontal("admin.start.immediately", formLayout, ENABLED_KEYS, enableValues);
String[] ltiRolesValues = new String[]{
translate("roles.lti.learner"),
@@ -178,7 +176,6 @@ public class OpencastAdminController extends FormBasicController {
courseNodeEnabledEl.select(ENABLED_KEYS[0], opencastModule.isCourseNodeEnabledRaw());
authDelegateTypeEl.select(opencastModule.getAuthDelegateType().name(), true);
authDelegateRolesEl.setValue(opencastModule.getAuthDelegateRoles());
- startImmediatelyEl.select(ENABLED_KEYS[0], opencastModule.isStartImmediately());
udpateRoles(rolesAdminEl, opencastModule.getRolesAdmin());
udpateRoles(rolesCoachEl, opencastModule.getRolesCoach());
udpateRoles(rolesParticipantEl, opencastModule.getRolesParticipant());
@@ -196,7 +193,6 @@ public class OpencastAdminController extends FormBasicController {
authDelegateTypeEl.setVisible(enabled);
boolean authDelegateRoles = authDelegateTypeEl.isOneSelected() && Type.Roles == Type.valueOf(authDelegateTypeEl.getSelectedValue());
authDelegateRolesEl.setVisible(enabled && authDelegateRoles);
- startImmediatelyEl.setVisible(enabled);
rolesAdminEl.setVisible(enabled);
rolesCoachEl.setVisible(enabled);
rolesParticipantEl.setVisible(enabled);
@@ -285,7 +281,7 @@ public class OpencastAdminController extends FormBasicController {
opencastModule.setCourseNodeEnabled(cnEnabled);
Type authDelegateType = authDelegateTypeEl.isOneSelected()
- ? Type.valueOf(authDelegateTypeEl.getSelectedValue())
+ ? Type.valueOf(authDelegateTypeEl.getSelectedKey())
: Type.User;
opencastModule.setAuthDelegateType(authDelegateType);
@@ -294,9 +290,6 @@ public class OpencastAdminController extends FormBasicController {
: null;
opencastModule.setAuthDelegateRoles(authDelegateRoles);
- boolean startImmediately = startImmediatelyEl.isAtLeastSelected(1);
- opencastModule.setStartImmediately(startImmediately);
-
String rolesAdmin = getRoles(rolesAdminEl);
opencastModule.setRolesAdmin(rolesAdmin);
diff --git a/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties
index 52f2415f83214363c154e451c8445b190cc60f7b..d6881a5fba143aab085ec0a57f1ce15bb9e32668 100644
--- a/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties
@@ -20,7 +20,6 @@ admin.lti.sign.url.example=http://localhost:8080/lti
admin.lti.sign.url.help=In einige Opencast Installationen wird f\u00fcr die Validierung der LTI Signatur nicht die LTI URL verwendet. Sie erhalten dann beim Aufruf eines Inhaltes aus Opencast die Felermeldung "Invalid signature for signature method HMAC-SHA1". Um diesen Fehler k\u00f6nnen Sie hier eine alternative URL f\u00fcr die Validierung der Signatur angeben.
admin.menu.title=Opencast
admin.menu.title.alt=Opencast
-admin.start.immediately=Unverz\u00fcglich starten
admin.title=Konfiguration
check.api.connection.ok=Die Verbindung konnte erfolgreich hergestellt werden!
check.api.connection.nok=Die Verbindung konnte nicht hergestellt werden!
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_en.properties
index 205a0574565a6a2499abf58c1b8cfcc97a4aed72..3163389ea82141c4697709bbc2949bb11bc34b9b 100644
--- a/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_en.properties
@@ -20,7 +20,6 @@ admin.lti.sign.url.example=http://localhost:8080/lti
admin.lti.sign.url.help=In some Opencast installations the LTI URL is not used for the validation of the LTI signature. In this case, you will receive the field message "Invalid signature for signature method HMAC-SHA1" when calling content from Opencast. To avoid this error, you can enter an alternative URL for the validation of the signature here.
admin.menu.title=Opencast
admin.menu.title.alt=Opencast
-admin.start.immediately=Start immediately
admin.title=Configuration
check.api.connection.ok=The connection was successfully established.
check.api.connection.nok=The connection could not be established!
\ No newline at end of file
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 57329e204e4bd212a1139c5722f7b2a9910cc37f..94bb099a1a0c2a5afdf1239533b2c31daaf55538 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -1819,7 +1819,6 @@ opencast.course.node.enabled=false
opencast.course.node.auth.delegate=User
opencast.course.node.auth.delegate.values=None,User,Roles
opencast.course.node.auth.delegate.roles=
-opencast.course.node.start.immediately=true
opencast.course.node.roles.values=Instructor,Administrator,TeachingAssistant,ContentDeveloper,Mentor,Learner
opencast.course.node.roles.admin=Instructor,Administrator,TeachingAssistant,ContentDeveloper,Mentor
opencast.course.node.roles.coach=Instructor,TeachingAssistant,Mentor