From 76dca6d4a9c7f38311df381c766561dedb4f1a3e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 10 Jul 2012 15:14:54 +0200
Subject: [PATCH] OMA-74: fix a deadly missing line (and make the controller
robust)
---
.../org/olat/commons/calendar/ui/WeeklyCalendarController.java | 2 +-
src/main/java/org/olat/course/nodes/cal/CourseCalendars.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java b/src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java
index 58443cc2522..faa461eb9eb 100644
--- a/src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java
+++ b/src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java
@@ -223,7 +223,7 @@ public class WeeklyCalendarController extends BasicController implements Activat
weeklyCalendar.addListener(this);
// subscription, see OLAT-3861
- if (!isGuest) {
+ if (!isGuest && !calendarWrappers.isEmpty()) {
SubscriptionProvider provider = new SubscriptionProviderImpl(caller, calendarWrappers.get(0));
subsContext = provider.getSubscriptionContext();
// if sc is null, then no subscription is desired
diff --git a/src/main/java/org/olat/course/nodes/cal/CourseCalendars.java b/src/main/java/org/olat/course/nodes/cal/CourseCalendars.java
index c55a5086119..1e4ac7f00bf 100644
--- a/src/main/java/org/olat/course/nodes/cal/CourseCalendars.java
+++ b/src/main/java/org/olat/course/nodes/cal/CourseCalendars.java
@@ -121,6 +121,7 @@ public class CourseCalendars {
ICourse course = CourseFactory.loadCourse(ores);
CourseLinkProviderController clpc = new CourseLinkProviderController(course, ureq, wControl);
courseKalendarWrapper.setLinkProvider(clpc);
+ calendars.add(courseKalendarWrapper);
Identity identity = ureq.getIdentity();
CourseGroupManager cgm = course.getCourseEnvironment().getCourseGroupManager();
--
GitLab