From a01ecbe4f551df438f311ca5c6c66a716ffc6731 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Fri, 2 Sep 2022 10:12:59 +0000
Subject: [PATCH] use current+next semester as default for globalsearch, fixes
#1348
Closes #1348
Merge request studip/studip!829
---
app/controllers/search/globalsearch.php | 12 ++++--------
lib/classes/globalsearch/GlobalSearchModule.php | 14 --------------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/app/controllers/search/globalsearch.php b/app/controllers/search/globalsearch.php
index 49c28610f3c..ed4ed6eaa4d 100644
--- a/app/controllers/search/globalsearch.php
+++ b/app/controllers/search/globalsearch.php
@@ -79,7 +79,7 @@ class Search_GlobalsearchController extends AuthenticatedController
null,
'semester',
$this->getSemesters(),
- (int) $_SESSION['global_search']['selects']['semester'],
+ 'future',
['id' => 'semester_select']
);
@@ -90,7 +90,7 @@ class Search_GlobalsearchController extends AuthenticatedController
null,
'seminar_type',
$this->getSemClasses(),
- $_SESSION['global_search']['selects']['seminar_type'],
+ '',
['id' => 'seminar_type_select']
);
@@ -101,7 +101,7 @@ class Search_GlobalsearchController extends AuthenticatedController
null,
'institute',
$this->getInstitutes(),
- $_SESSION['global_search']['selects']['institute'],
+ '',
['id' => 'institute_select']
);
}
@@ -115,12 +115,8 @@ class Search_GlobalsearchController extends AuthenticatedController
*/
private function getSemesters()
{
- // set the current semester as the initially selected semester
- if (!$_SESSION['global_search']['selects']) {
- $current_sem = GlobalSearchModule::getCurrentSemester();
- $_SESSION['global_search']['selects']['semester'] = $current_sem;
- }
$semesters = [];
+ $semesters['future'] = _('Aktuelles und nächstes Semester');
$semesters[''] = _('Alle Semester');
$sems = array_reverse(Semester::getAll());
diff --git a/lib/classes/globalsearch/GlobalSearchModule.php b/lib/classes/globalsearch/GlobalSearchModule.php
index 084e3279892..49d5e74b899 100644
--- a/lib/classes/globalsearch/GlobalSearchModule.php
+++ b/lib/classes/globalsearch/GlobalSearchModule.php
@@ -205,20 +205,6 @@ abstract class GlobalSearchModule
}
}
- /**
- * Get the current semester considering the given
- * SEMESTER_TIME_SWITCH in the CONFIG
- * (n weeks before the next semester)
- *
- * @return int The start time of the current semester.
- */
- public static function getCurrentSemester()
- {
- $current_semester = Semester::findDefault();
-
- return (int)$current_semester['beginn'];
- }
-
/**
* Returns a list of all active search modules
* @return array search_class => data
--
GitLab