From ae5515449665a8aa1571cda8de7ffc4b2dec997b Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Fri, 1 Nov 2019 14:16:18 +0100
Subject: [PATCH] OO-4168: Show course name of forum course tool in
subscription overview
---
.../org/olat/course/nodes/fo/FOToolController.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/fo/FOToolController.java b/src/main/java/org/olat/course/nodes/fo/FOToolController.java
index 2aaf6325be0..cb7b4aed5bb 100644
--- a/src/main/java/org/olat/course/nodes/fo/FOToolController.java
+++ b/src/main/java/org/olat/course/nodes/fo/FOToolController.java
@@ -25,6 +25,9 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.id.OLATResourceable;
+import org.olat.core.util.resource.OresHelper;
+import org.olat.course.CourseModule;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.fo.Forum;
import org.olat.modules.fo.ForumCallback;
@@ -54,8 +57,11 @@ public class FOToolController extends BasicController {
RepositoryEntry courseEntry = userCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
Forum forum = getOrCreateForum(courseEntry);
-
- SubscriptionContext forumSubContext = new SubscriptionContext(courseEntry, SUBSCRIPTION_SUBIDENTIFIER);
+ String resName = CourseModule.getCourseTypeName();
+ Long resId = userCourseEnv.getCourseEnvironment().getCourseResourceableId();
+ OLATResourceable courseOres = OresHelper.createOLATResourceableInstance(resName, resId);
+ SubscriptionContext forumSubContext = new SubscriptionContext(courseOres, SUBSCRIPTION_SUBIDENTIFIER);
+
ForumCallback forumCallback = userCourseEnv.isCourseReadOnly() || ureq.getUserSession().getRoles().isGuestOnly()
? new ReadOnlyForumCallback(userCourseEnv)
: new ToolSecurityCallback(userCourseEnv, forumSubContext);
--
GitLab