From d201ad765bd37cf6907ab41917bf8292fc3eebd9 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Wed, 20 Oct 2021 13:14:06 +0200
Subject: [PATCH] fixes #273
---
app/controllers/course/timesrooms.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index 14db14fe1bf..486d7b065f9 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -1051,15 +1051,13 @@ class Course_TimesroomsController extends AuthenticatedController
$this->has_bookings = $count > 0;
}
-
- $course = Course::find($this->course->id);
if ($this->course->isOpenEnded()) { // course with endless lifespan
- $end_semester = Semester::findBySQL("beginn >= ? ", [$this->course->start_time]);
+ $end_semester = Semester::findBySQL("beginn >= ? ORDER BY beginn", [$this->course->start_time]);
} else { // course over more than one semester
- $end_semester = $course->semesters;
+ $end_semester = $this->course->semesters;
}
- $this->start_weeks = $this->course->end_semester->getStartWeeks();
+ $this->start_weeks = $this->course->start_semester->getStartWeeks($this->course->duration_time);
if (!empty($end_semester)) {
$this->end_semester_weeks = [];
--
GitLab