Skip to content
Snippets Groups Projects
Commit daf2e700 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

cleanup user-config, closes #3803

Closes #3803

Merge request studip/studip!2672
parent 9021a575
No related branches found
No related tags found
No related merge requests found
...@@ -48,10 +48,7 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -48,10 +48,7 @@ class Admin_CourseplanningController extends AuthenticatedController
$stgteil = StudiengangTeil::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL); $stgteil = StudiengangTeil::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL);
$plan_title .= ' - ' . $stgteil->getDisplayName(); $plan_title .= ' - ' . $stgteil->getDisplayName();
} }
if ( if (isset($this->semester) && $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE
isset($this->semester)
&& $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE
&& $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE !== 'all'
) { ) {
$plan_title .= ' - ' . $this->semester->name; $plan_title .= ' - ' . $this->semester->name;
} }
...@@ -611,7 +608,7 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -611,7 +608,7 @@ class Admin_CourseplanningController extends AuthenticatedController
$sidebar = Sidebar::Get(); $sidebar = Sidebar::Get();
$list = new SelectWidget(_('Semester'), $this->url_for('admin/courseplanning/set_selection/' . $this->selected_weekday), 'sem_select'); $list = new SelectWidget(_('Semester'), $this->url_for('admin/courseplanning/set_selection/' . $this->selected_weekday), 'sem_select');
foreach ($semesters as $semester) { foreach ($semesters as $semester) {
if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE ||$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE == 'all') { if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) {
$GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', $semester->id); $GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', $semester->id);
} }
$list->addElement(new SelectElement( $list->addElement(new SelectElement(
...@@ -726,7 +723,7 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -726,7 +723,7 @@ class Admin_CourseplanningController extends AuthenticatedController
$sidebar = Sidebar::Get(); $sidebar = Sidebar::Get();
$list = new SelectWidget(_('Lehrendenfilter'), $this->url_for('admin/courseplanning/index'), 'teacher_filter'); $list = new SelectWidget(_('Lehrendenfilter'), $this->url_for('admin/courseplanning/index'), 'teacher_filter');
$list->addElement(new SelectElement('all', _('alle'), Request::get('teacher_filter') == 'all'), 'teacher_filter-all'); $list->addElement(new SelectElement('', _('alle'), Request::get('teacher_filter') === ''), 'teacher_filter-all');
foreach ($teachers as $teacher) { foreach ($teachers as $teacher) {
$list->addElement(new SelectElement( $list->addElement(new SelectElement(
...@@ -848,7 +845,7 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -848,7 +845,7 @@ class Admin_CourseplanningController extends AuthenticatedController
if (Request::option('sem_select')) { if (Request::option('sem_select')) {
$GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', Request::option('sem_select')); $GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', Request::option('sem_select'));
if (Request::option('sem_select') !== 'all') { if (Request::option('sem_select') !== '') {
PageLayout::postSuccess(sprintf( PageLayout::postSuccess(sprintf(
_('Das %s wurde ausgewählt'), _('Das %s wurde ausgewählt'),
htmlReady(Semester::find(Request::option('sem_select'))->name) htmlReady(Semester::find(Request::option('sem_select'))->name)
......
...@@ -90,10 +90,7 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -90,10 +90,7 @@ class Course_TimesroomsController extends AuthenticatedController
if (!Request::isXhr()) { if (!Request::isXhr()) {
$this->setSidebar(); $this->setSidebar();
} elseif (Request::isXhr() && $this->flash['update-times']) { } elseif (Request::isXhr() && $this->flash['update-times']) {
$semester_id = $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE; $semester_id = $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE ?? '';
if ($semester_id === 'all') {
$semester_id = '';
}
$this->response->add_header( $this->response->add_header(
'X-Raumzeit-Update-Times', 'X-Raumzeit-Update-Times',
json_encode([ json_encode([
......
...@@ -344,7 +344,7 @@ class MyCoursesController extends AuthenticatedController ...@@ -344,7 +344,7 @@ class MyCoursesController extends AuthenticatedController
* @param string $type * @param string $type
* @param string $sem * @param string $sem
*/ */
public function tabularasa_action($sem = 'all', $timestamp = null) public function tabularasa_action($sem = '', $timestamp = null)
{ {
NotificationCenter::postNotification('OverviewWillClear', $GLOBALS['user']->id); NotificationCenter::postNotification('OverviewWillClear', $GLOBALS['user']->id);
...@@ -628,7 +628,8 @@ class MyCoursesController extends AuthenticatedController ...@@ -628,7 +628,8 @@ class MyCoursesController extends AuthenticatedController
*/ */
public function set_semester_action() public function set_semester_action()
{ {
$sem = Request::option('sem_select', null); $sem = Request::option('sem_select');
if (!is_null($sem)) { if (!is_null($sem)) {
$GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', $sem); $GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_CYCLE', $sem);
PageLayout::postSuccess( PageLayout::postSuccess(
...@@ -1118,7 +1119,7 @@ class MyCoursesController extends AuthenticatedController ...@@ -1118,7 +1119,7 @@ class MyCoursesController extends AuthenticatedController
private function getSemesterKey() private function getSemesterKey()
{ {
$config_sem = $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE; $config_sem = $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE;
if (!Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS && $config_sem === 'all') { if (!Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS && $config_sem === '') {
$config_sem = 'future'; $config_sem = 'future';
} }
...@@ -1130,11 +1131,10 @@ class MyCoursesController extends AuthenticatedController ...@@ -1130,11 +1131,10 @@ class MyCoursesController extends AuthenticatedController
$config_sem = null; $config_sem = null;
} }
$sem = Request::get( if (!Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS && !$config_sem) {
'sem_select', $config_sem = Config::get()->MY_COURSES_DEFAULT_CYCLE;
$config_sem ?: Config::get()->MY_COURSES_DEFAULT_CYCLE }
); $sem = Request::get('sem_select', $config_sem);
if ($sem && !$this->isValidTextualSemesterEntry($sem)) { if ($sem && !$this->isValidTextualSemesterEntry($sem)) {
Request::set('sem_select', $sem); Request::set('sem_select', $sem);
...@@ -1181,7 +1181,7 @@ class MyCoursesController extends AuthenticatedController ...@@ -1181,7 +1181,7 @@ class MyCoursesController extends AuthenticatedController
]; ];
if (Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS) { if (Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS) {
$entries['all'] = _('Alle Semester'); $entries[''] = _('Alle Semester');
} }
return $entries; return $entries;
......
...@@ -85,7 +85,7 @@ $colspan = 2 ...@@ -85,7 +85,7 @@ $colspan = 2
</colgroup> </colgroup>
<caption> <caption>
<? if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE || ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE === "all")) : ?> <? if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) : ?>
<?= _('Veranstaltungen') ?> <?= _('Veranstaltungen') ?>
<? else : ?> <? else : ?>
<?= htmlReady(sprintf(_('Veranstaltungen im %s'), $semester->name)) ?> <?= htmlReady(sprintf(_('Veranstaltungen im %s'), $semester->name)) ?>
......
<?php
final class ResetMyCoursesFilter extends Migration
{
public function description()
{
return 'Cleanup user-config';
}
public function up()
{
DBManager::get()->exec("UPDATE `config_values` SET `value` = '' WHERE `value` = 'all' AND `field` IN ('ADMIN_COURSES_TEACHERFILTER', 'MY_COURSES_SELECTED_CYCLE')");
}
}
...@@ -225,7 +225,7 @@ class MyRealmModel ...@@ -225,7 +225,7 @@ class MyRealmModel
return self::sortCourses($courses, $ordering); return self::sortCourses($courses, $ordering);
} }
public static function getSelectedSemesters($sem = 'all') public static function getSelectedSemesters($sem = '')
{ {
$sem_data = Semester::getAllAsArray(); $sem_data = Semester::getAllAsArray();
$semesters = []; $semesters = [];
...@@ -241,14 +241,8 @@ class MyRealmModel ...@@ -241,14 +241,8 @@ class MyRealmModel
$max_sem = $current_sem; $max_sem = $current_sem;
} }
if (isset($sem_data[$current_sem + 2])) {
$after_next_sem = $current_sem + 2;
} else {
$after_next_sem = $max_sem;
}
// Get the needed semester // Get the needed semester
if (!in_array($sem, ['all', 'current', 'future', 'last', 'lastandnext'])) { if (!in_array($sem, ['', 'current', 'future', 'last', 'lastandnext'])) {
$semesters[] = Semester::getIndexById($sem); $semesters[] = Semester::getIndexById($sem);
} else { } else {
switch ($sem) { switch ($sem) {
...@@ -284,7 +278,7 @@ class MyRealmModel ...@@ -284,7 +278,7 @@ class MyRealmModel
* @param array $params Additional parameters * @param array $params Additional parameters
* @return array * @return array
*/ */
public static function getPreparedCourses($sem = 'all', $params = []) public static function getPreparedCourses($sem = '', $params = [])
{ {
$semesters = self::getSelectedSemesters($sem); $semesters = self::getSelectedSemesters($sem);
$current_semester_nr = Semester::getIndexById(@Semester::findCurrent()->id); $current_semester_nr = Semester::getIndexById(@Semester::findCurrent()->id);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment