From 33f129925a969ab2f2e58ed53d893f726002e6e5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 22 Jun 2017 09:00:26 +0200
Subject: [PATCH] OO-2636: lecture module disabled per default, fix behavior of
the lectures blocks list in user tool for the coaches
---
.../org/olat/modules/lecture/LectureModule.java | 2 +-
.../ui/AbstractTeacherOverviewController.java | 10 +++++-----
.../modules/lecture/ui/LecturesToolController.java | 1 +
.../lecture/ui/TeacherToolOverviewController.java | 14 ++++++++++++++
src/test/profile/mysql/olat.local.properties | 3 +++
src/test/profile/postgresql/olat.local.properties | 3 +++
6 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/modules/lecture/LectureModule.java b/src/main/java/org/olat/modules/lecture/LectureModule.java
index c8e2ec52222..20c653a8fa3 100644
--- a/src/main/java/org/olat/modules/lecture/LectureModule.java
+++ b/src/main/java/org/olat/modules/lecture/LectureModule.java
@@ -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;
diff --git a/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java b/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java
index 07b76892f8a..85162a75b90 100644
--- a/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java
@@ -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;
diff --git a/src/main/java/org/olat/modules/lecture/ui/LecturesToolController.java b/src/main/java/org/olat/modules/lecture/ui/LecturesToolController.java
index 3d23e932a72..192449d8791 100644
--- a/src/main/java/org/olat/modules/lecture/ui/LecturesToolController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/LecturesToolController.java
@@ -79,6 +79,7 @@ public class LecturesToolController extends BasicController implements Breadcrum
@Override
public void setBreadcrumbPanel(BreadcrumbPanel stackPanel) {
participantOverviewCtrl.setBreadcrumbPanel(stackPanel);
+ teacherOverviewCtrl.setBreadcrumbPanel(stackPanel);
}
@Override
diff --git a/src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java b/src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java
index 3ae45ec4d87..a6740922b26 100644
--- a/src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java
@@ -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
diff --git a/src/test/profile/mysql/olat.local.properties b/src/test/profile/mysql/olat.local.properties
index 77e3df44fc2..c022f509132 100644
--- a/src/test/profile/mysql/olat.local.properties
+++ b/src/test/profile/mysql/olat.local.properties
@@ -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
diff --git a/src/test/profile/postgresql/olat.local.properties b/src/test/profile/postgresql/olat.local.properties
index ff368deacf0..6afe2357d84 100644
--- a/src/test/profile/postgresql/olat.local.properties
+++ b/src/test/profile/postgresql/olat.local.properties
@@ -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
--
GitLab