Skip to content
Snippets Groups Projects
Commit 33f12992 authored by srosse's avatar srosse
Browse files

OO-2636: lecture module disabled per default, fix behavior of the lectures...

OO-2636: lecture module disabled per default, fix behavior of the lectures blocks list in user tool for the coaches
parent 4b8b3148
No related branches found
No related tags found
No related merge requests found
......@@ -57,7 +57,7 @@ public class LectureModule extends AbstractSpringModule implements ConfigOnOff {
private static final String COURSE_CALENDAR_SYNC_DEFAULT_ENABLED = "lecture.course.calendar.sync.default.enabed";
private static final String ABSENCE_DEFAULT_AUTHORIZED = "lecture.absence.default.authorized";
@Value("${lecture.enabled:true}")
@Value("${lecture.enabled:false}")
private boolean enabled;
@Value("${lecture.managed:true}")
private boolean lecturesManaged;
......
......@@ -56,7 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*/
public abstract class AbstractTeacherOverviewController extends BasicController implements BreadcrumbPanelAware {
private BreadcrumbPanel stackPanel;
protected BreadcrumbPanel stackPanel;
protected final VelocityContainer mainVC;
private final Link startButton, startWizardButton;
protected final Link allTeachersSwitch;
......@@ -64,10 +64,10 @@ public abstract class AbstractTeacherOverviewController extends BasicController
private TeacherRollCallController rollCallCtrl;
private TeacherRollCallWizardController rollCallWizardCtrl;
protected TeacherLecturesTableController currentLecturesBlockCtrl;
protected TeacherLecturesTableController pendingLecturesBlockCtrl;
protected TeacherLecturesTableController nextLecturesBlockCtrl;
protected TeacherLecturesTableController closedLecturesBlockCtrl;
private TeacherLecturesTableController currentLecturesBlockCtrl;
private TeacherLecturesTableController pendingLecturesBlockCtrl;
private TeacherLecturesTableController nextLecturesBlockCtrl;
private TeacherLecturesTableController closedLecturesBlockCtrl;
private final boolean admin;
private final String switchPrefsId;
......
......@@ -79,6 +79,7 @@ public class LecturesToolController extends BasicController implements Breadcrum
@Override
public void setBreadcrumbPanel(BreadcrumbPanel stackPanel) {
participantOverviewCtrl.setBreadcrumbPanel(stackPanel);
teacherOverviewCtrl.setBreadcrumbPanel(stackPanel);
}
@Override
......
......@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.modules.lecture.LectureBlock;
import org.olat.modules.lecture.LectureService;
......@@ -56,4 +58,16 @@ public class TeacherToolOverviewController extends AbstractTeacherOverviewContro
}
return rows;
}
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
//reload table... first
super.event(ureq, source, event);
if(source instanceof TeacherLecturesTableController) {
if(event == Event.DONE_EVENT || event == Event.CANCELLED_EVENT) {
stackPanel.popUpToRootController(ureq);
}
}
}
}
\ No newline at end of file
......@@ -59,6 +59,9 @@ ldap.ldapSystemPW=olattest
ldap.ldapBases=ou=person,dc=olattest,dc=org
ldap.attributename.useridentifyer=uid
#make sure the lecture module is enabled
lecture.enabled=true
#make sure it works it mimic the pre 8.3 behavior
group.mandatory.enrolment.email.users=false
group.mandatory.enrolment.email.authors=false
......
......@@ -60,6 +60,9 @@ ldap.ldapSystemPW=olattest
ldap.ldapBases=ou=person,dc=olattest,dc=org
ldap.attributename.useridentifyer=uid
#make sure the lecture module is enabled
lecture.enabled=true
#make sure it works it mimic the pre 8.3 behavior
group.mandatory.enrolment.email.users=false
group.mandatory.enrolment.email.authors=false
......
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