diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-02-12 16:07:56 +0100 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-02-12 16:07:56 +0100 |
| commit | a44abab1664828cb25693d72352fc9e002ce5426 (patch) | |
| tree | 2a289f81604ca9dd3369366b1536c0301b3ab2ef | |
| parent | 9e7ef8181fbe56c2ce25ccf638e958a980acff43 (diff) | |
fix all dates retrieval, fixes #6254
Closes #6254
Merge request studip/studip!4727
| -rw-r--r-- | lib/models/Course.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/models/Course.php b/lib/models/Course.php index dbe8445..db729c6 100644 --- a/lib/models/Course.php +++ b/lib/models/Course.php @@ -1925,10 +1925,17 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe SeminarCycleDate::findEachBySQL( function ($date) use ($collection) { - $collection->addCycleDate($date); + $collection->addRegularDate($date); }, - "`start_time` >= :beginning AND `end_time` <= :end - AND `seminar_id` = :course_id", + "`metadate_id` IN ( + SELECT `metadate_id` + FROM `termine` + WHERE `range_id` = :course_id + AND `termine`.`date` <= :end + AND `termine`.`end_time` >= :beginning + AND `metadate_id` IS NOT NULL + AND `metadate_id` != '' + )", [ 'course_id' => $this->id, 'beginning' => $beginning, |