Skip to content
Snippets Groups Projects
Commit 8ceeeb00 authored by uhensler's avatar uhensler
Browse files

OO-4836: Remove option to start immediately

parent 41b20e96
No related branches found
No related tags found
No related merge requests found
......@@ -66,7 +66,6 @@ public class OpencastDisplayController extends FormBasicController {
roles = initRoles(userCourseEnv);
initForm(ureq);
doStartImmediately(ureq);
}
private String initRoles(UserCourseEnvironment userCourseEnv) {
......@@ -128,18 +127,6 @@ public class OpencastDisplayController extends FormBasicController {
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));
......
......@@ -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;
}
......
......@@ -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);
......@@ -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);
......
......@@ -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
......@@ -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
......@@ -1787,7 +1787,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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment