Skip to content
Snippets Groups Projects
Commit c5c53c47 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

ensure a valid semester is always selected, fixes #4527

Closes #4527

Merge request studip/studip!3327
parent cfe2f76e
No related branches found
No related tags found
No related merge requests found
...@@ -83,17 +83,20 @@ class Calendar_ScheduleController extends AuthenticatedController ...@@ -83,17 +83,20 @@ class Calendar_ScheduleController extends AuthenticatedController
// check, if the hidden seminar-entries shall be shown // check, if the hidden seminar-entries shall be shown
$show_hidden = Request::int('show_hidden', 0); $show_hidden = Request::int('show_hidden', 0);
// load semester-data and current semester // load semester-data and current semester
$this->semesters = array_reverse(Semester::findAllVisible(false)); $this->semesters = array_reverse(Semester::findAllVisible(false));
if (Request::option('semester_id')) { $this->current_semester = Semester::findCurrent();
$this->current_semester = Semester::find(Request::option('semester_id'));
$schedule_settings['semester_id'] = Request::option('semester_id'); $semester_id = Request::option('semester_id', $schedule_settings['semester_id'] ?? null);
UserConfig::get($GLOBALS['user']->id)->store('SCHEDULE_SETTINGS', if ($semester_id && Semester::exists($semester_id)) {
$schedule_settings); $this->current_semester = Semester::find($semester_id);
} else {
$this->current_semester = !empty($schedule_settings['semester_id']) ? $schedule_settings['semester_id'] = $this->current_semester->id;
Semester::find($schedule_settings['semester_id']) : User::findCurrent()->getConfiguration()->store(
Semester::findCurrent(); 'SCHEDULE_SETTINGS',
$schedule_settings
);
} }
// check type-safe if days is false otherwise sunday (0) cannot be chosen // check type-safe if days is false otherwise sunday (0) cannot be chosen
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment