From 1f6517b3203d8fd33a6a6b65fa4f2022f4349a27 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Mon, 10 Mar 2025 10:28:01 +0000 Subject: provide correct semester to search, fixes #5078 Closes #5078 Merge request studip/studip!4016 --- app/controllers/admin/autoinsert.php | 8 ++++---- lib/classes/searchtypes/SeminarSearch.php | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/autoinsert.php b/app/controllers/admin/autoinsert.php index 003586e..48d68ed 100644 --- a/app/controllers/admin/autoinsert.php +++ b/app/controllers/admin/autoinsert.php @@ -44,11 +44,11 @@ class Admin_AutoinsertController extends AuthenticatedController if (Request::submitted('suchen')) { if (Request::get('sem_search')) { $this->sem_search = Request::get('sem_search'); - $this->sem_select = Request::option('sem_select'); + $this->sem_select = Request::option('sem_select') ?: null; $search = new SeminarSearch(); - $this->seminar_search = $search->getResults - (Request::get('sem_search'), - ['search_sem_sem' => Request::option('sem_select')] + $this->seminar_search = $search->getResults( + $this->sem_search, + ['search_sem_sem' => $this->sem_select] ); if (count($this->seminar_search) == 0) { PageLayout::postInfo(_('Es wurden keine Veranstaltungen gefunden.')); diff --git a/lib/classes/searchtypes/SeminarSearch.php b/lib/classes/searchtypes/SeminarSearch.php index a8ac22d..1875599 100644 --- a/lib/classes/searchtypes/SeminarSearch.php +++ b/lib/classes/searchtypes/SeminarSearch.php @@ -37,13 +37,14 @@ class SeminarSearch extends SearchType * ) * where $key is an identifier like user_id and $name is a displayed text * that should appear to represent that ID. - * @param keyword: string + * @param string $keyword * @param array $contextual_data an associative array with more variables * @param int $limit maximum number of results (default: all) * @param int $offset return results starting from this row (default: 0) * @return array */ - public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0) { + public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0) + { $search_helper = new StudipSemSearchHelper(); $search_helper->setParams( [ -- cgit v1.0