diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2024-05-13 09:45:09 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-05-13 09:45:09 +0000 |
| commit | c0c705fa365e0bc971f8923cf050dee17c62a8b8 (patch) | |
| tree | 3ecb09f7ab1ae046b6f4d858a6967e41645ad887 | |
| parent | 1ed2587c0b55d7587477c7269fe5e30b098ad592 (diff) | |
Fix for BIESt 3818, fixes #3818
Closes #3818
Merge request studip/studip!2979
| -rw-r--r-- | app/controllers/calendar/calendar.php | 10 | ||||
| -rw-r--r-- | 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 d0d5743..89421cb 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 ac0c8c3..59fbb9c 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)) { |