From eba77a2efd7d7b3995aa31ac809f5a5845b0ae00 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 8 Feb 2021 10:35:42 +0100
Subject: [PATCH] OO-5280: catch the close entry event in TOC and entries list
---
.../olat/modules/portfolio/ui/AbstractPageListController.java | 3 ++-
.../olat/modules/portfolio/ui/TableOfContentController.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
index 82f97753eda..97b715ee8cd 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
@@ -93,6 +93,7 @@ import org.olat.modules.portfolio.SectionStatus;
import org.olat.modules.portfolio.ui.PageListDataModel.PageCols;
import org.olat.modules.portfolio.ui.component.CategoriesCellRenderer;
import org.olat.modules.portfolio.ui.component.TimelineElement;
+import org.olat.modules.portfolio.ui.event.ClosePageEvent;
import org.olat.modules.portfolio.ui.event.PageDeletedEvent;
import org.olat.modules.portfolio.ui.event.PageRemovedEvent;
import org.olat.modules.portfolio.ui.event.SelectPageEvent;
@@ -558,7 +559,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
@Override
public void event(UserRequest ureq, Controller source, Event event) {
if(pageCtrl == source) {
- if(event == Event.CHANGED_EVENT) {
+ if(event == Event.CHANGED_EVENT || event instanceof ClosePageEvent) {
loadModel(ureq, null);
fireEvent(ureq, Event.CHANGED_EVENT);
} else if(event instanceof PageRemovedEvent) {
diff --git a/src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java b/src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java
index daf0f4dbfc1..e32f43dd40d 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java
@@ -87,6 +87,7 @@ import org.olat.modules.portfolio.SectionStatus;
import org.olat.modules.portfolio.model.BinderStatistics;
import org.olat.modules.portfolio.model.ExtendedMediaRenderingHints;
import org.olat.modules.portfolio.model.SectionRefImpl;
+import org.olat.modules.portfolio.ui.event.ClosePageEvent;
import org.olat.modules.portfolio.ui.event.DeleteBinderEvent;
import org.olat.modules.portfolio.ui.event.PageDeletedEvent;
import org.olat.modules.portfolio.ui.event.PageRemovedEvent;
@@ -553,7 +554,7 @@ public class TableOfContentController extends BasicController implements TooledC
cmc.deactivate();
cleanUp();
} else if(pageCtrl == source) {
- if(event == Event.CHANGED_EVENT) {
+ if(event == Event.CHANGED_EVENT || event instanceof ClosePageEvent) {
loadModel();
fireEvent(ureq, Event.CHANGED_EVENT);
} else if(event instanceof PageRemovedEvent || event instanceof PageDeletedEvent) {
--
GitLab