From d41352f3d7efe64b451f25b37066929d573509da Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 9 Jan 2020 13:36:10 +0100
Subject: [PATCH] OO-4435: make the cancel in lectures list consistent with
search params.
---
.../modules/lecture/ui/AbstractTeacherOverviewController.java | 3 ---
.../modules/lecture/ui/TeacherOverviewSearchController.java | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
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 e1986a76dec..f639b41ec83 100644
--- a/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java
@@ -298,9 +298,6 @@ public abstract class AbstractTeacherOverviewController extends BasicController
} else if(searchCtrl == source) {
if(event instanceof SearchLecturesBlockEvent) {
doSearch((SearchLecturesBlockEvent)event);
- } else if(event == Event.CANCELLED_EVENT) {
- currentSearchParams = new LecturesBlockSearchParameters();
- loadModel(currentSearchParams);
}
}
super.event(ureq, source, event);
diff --git a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java
index 8232e1c6766..22876eefaf0 100644
--- a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java
@@ -30,7 +30,6 @@ import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.generic.dtabs.Activateable2;
import org.olat.core.id.context.ContextEntry;
@@ -167,7 +166,7 @@ public class TeacherOverviewSearchController extends FormBasicController impleme
searchEl.setValue(null);
startEl.setDate(defaultStartDate);
endEl.setDate(defaultEndDate);
- fireEvent(ureq, Event.CANCELLED_EVENT);
+ doSearch(ureq);
}
private void doSearch(UserRequest ureq) {
--
GitLab