diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2025-02-27 18:30:47 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-02-27 18:30:47 +0000 |
| commit | a2ff4e3a715218f5598be5d894fa4f06b65b79d0 (patch) | |
| tree | 722c7975d4ff0a5941fa0d40624488f3c24ceac9 /lib/models/SeminarCycleDate.php | |
| parent | 4f6b4fb49e38ed5b87df7b52bbf19f1a0e8add87 (diff) | |
regard the freetext room name in CourseDate::getFullName (format "long-include-room") and SeminarCycleDate::toString (format "long-start"), fixes #5256
Closes #5256
Merge request studip/studip!3941
Diffstat (limited to 'lib/models/SeminarCycleDate.php')
| -rw-r--r-- | lib/models/SeminarCycleDate.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php index 2a6857f..135b676 100644 --- a/lib/models/SeminarCycleDate.php +++ b/lib/models/SeminarCycleDate.php @@ -244,12 +244,19 @@ class SeminarCycleDate extends SimpleORMap } elseif ($format === 'long-start') { $text = _('%{weekday}, %{beginning} - %{end}, %{interval}'); $room = $this->getMostBookedRoom(); + if ($room) { $parameters['room_name'] = sprintf( '<a href="%1$s" data-dialog="size=auto">%2$s</a>', $room->getActionLink(), htmlReady($room->name) ); + } else { + //Use the freetext room name: + $room = $this->getMostUsedFreetextRoomName(); + if ($room) { + $parameters['room_name'] = $room; + } } $first_date = $this->getFirstDate(); if ($first_date) { |