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

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
index 82dd692..9a8d553 100644
--- a/lib/models/CourseDate.php
+++ b/lib/models/CourseDate.php
@@ -338,12 +338,15 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
 
         if (in_array($format, ['include-room', 'long-include-room'])) {
             $room = $this->getRoom();
-            if($room) {
+            if ($room) {
                 $string = sprintf('%s <a href="%s" target="_blank">%s</a>',
                     $string,
                     $room->getActionURL('booking_plan'),
                     htmlReady($room->name)
                 );
+            } elseif ($this->raum) {
+                //Use the freetext room name:
+                $string .= ' ' . $this->raum;
             }
         }
         return $string;
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) {