Skip to content
Snippets Groups Projects
Commit c0c705fa authored by Moritz Strohm's avatar Moritz Strohm Committed by Jan-Hendrik Willms
Browse files

Fix for BIESt 3818, fixes #3818 

Closes #3818

Merge request studip/studip!2979
parent 1ed2587c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/calendar/calendar.php
+ 4
− 6
View file @ c0c705fa
...@@ -578,20 +578,18 @@ class Calendar_CalendarController extends AuthenticatedController ...@@ -578,20 +578,18 @@ class Calendar_CalendarController extends AuthenticatedController
$course_dates = CalendarCourseDate::getEvents($begin, $end, $owner->id); $course_dates = CalendarCourseDate::getEvents($begin, $end, $owner->id);
foreach ($course_dates as $course_date) { foreach ($course_dates as $course_date) {
$event = $course_date->toEventData(User::findCurrent()->id); $event = $course_date->toEventData(User::findCurrent()->id);
$event->background_colour = '#ffffff'; $event->background_colour = '';
$event->text_colour = '#000000'; $event->text_colour = '#000000';
$event->border_colour = '#000000'; $event->border_colour = '';
$event->event_classes = [];
$result[] = $event->toFullcalendarEvent(); $result[] = $event->toFullcalendarEvent();
} }
//Include relevant cancelled course dates: //Include relevant cancelled course dates:
$cancelled_course_dates = CalendarCourseExDate::getEvents($begin, $end, $owner->id); $cancelled_course_dates = CalendarCourseExDate::getEvents($begin, $end, $owner->id);
foreach ($cancelled_course_dates as $cancelled_course_date) { foreach ($cancelled_course_dates as $cancelled_course_date) {
$event = $cancelled_course_date->toEventData(User::findCurrent()->id); $event = $cancelled_course_date->toEventData(User::findCurrent()->id);
$event->background_colour = '#ffffff'; $event->background_colour = '';
$event->text_colour = '#000000'; $event->text_colour = '#000000';
$event->border_colour = '#000000'; $event->border_colour = '';
$event->event_classes = [];
$result[] = $event->toFullcalendarEvent(); $result[] = $event->toFullcalendarEvent();
} }
} }
......
lib/models/CourseDate.class.php
+ 1
− 1
View file @ c0c705fa
...@@ -633,7 +633,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event ...@@ -633,7 +633,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
); );
$class_names = []; $class_names = [];
if ($membership) { if ($membership) {
$class_names[] = sprintf('gruppe%u', $membership->status); $class_names[] = 'course-color-' . $membership->gruppe;
} }
$studip_view_urls = []; $studip_view_urls = [];
if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) { if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment