Skip to content
Snippets Groups Projects
Commit 00058418 authored by srosse's avatar srosse
Browse files

Merge with 56331e507615c613b9423e77efa73eeca4cd3617

parents d20e52aa 76dca6d4
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment