From c0c705fa365e0bc971f8923cf050dee17c62a8b8 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 13 May 2024 09:45:09 +0000
Subject: [PATCH] Fix for BIESt 3818, fixes #3818
Closes #3818
Merge request studip/studip!2979
---
app/controllers/calendar/calendar.php | 10 ++++------
lib/models/CourseDate.class.php | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index d0d574391c5..89421cb3e99 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -578,20 +578,18 @@ class Calendar_CalendarController extends AuthenticatedController
$course_dates = CalendarCourseDate::getEvents($begin, $end, $owner->id);
foreach ($course_dates as $course_date) {
$event = $course_date->toEventData(User::findCurrent()->id);
- $event->background_colour = '#ffffff';
+ $event->background_colour = '';
$event->text_colour = '#000000';
- $event->border_colour = '#000000';
- $event->event_classes = [];
+ $event->border_colour = '';
$result[] = $event->toFullcalendarEvent();
}
//Include relevant cancelled course dates:
$cancelled_course_dates = CalendarCourseExDate::getEvents($begin, $end, $owner->id);
foreach ($cancelled_course_dates as $cancelled_course_date) {
$event = $cancelled_course_date->toEventData(User::findCurrent()->id);
- $event->background_colour = '#ffffff';
+ $event->background_colour = '';
$event->text_colour = '#000000';
- $event->border_colour = '#000000';
- $event->event_classes = [];
+ $event->border_colour = '';
$result[] = $event->toFullcalendarEvent();
}
}
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
index ac0c8c384fa..59fbb9c3a25 100644
--- a/lib/models/CourseDate.class.php
+++ b/lib/models/CourseDate.class.php
@@ -633,7 +633,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
);
$class_names = [];
if ($membership) {
- $class_names[] = sprintf('gruppe%u', $membership->status);
+ $class_names[] = 'course-color-' . $membership->gruppe;
}
$studip_view_urls = [];
if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
--
GitLab