Skip to content
Snippets Groups Projects
Commit 9572581a authored by Elmar Ludwig's avatar Elmar Ludwig Committed by David Siegfried
Browse files

don't force setting of MY_INSTITUTES_DEFAULT or MY_COURSES_SELECTED_STGTEIL, fixes #1771

Closes #1771

Merge request studip/studip!1150
parent 49ece252
No related branches found
No related tags found
No related merge requests found
...@@ -22,10 +22,6 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -22,10 +22,6 @@ class Admin_CourseplanningController extends AuthenticatedController
PageLayout::postError(_('Sie wurden noch keiner Einrichtung zugeordnet')); PageLayout::postError(_('Sie wurden noch keiner Einrichtung zugeordnet'));
} }
if (!$GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT) {
$GLOBALS['user']->cfg->store('MY_INSTITUTES_DEFAULT', $this->insts[0]['Institut_id']);
}
// Semester selection // Semester selection
if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) { if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) {
$this->semester = Semester::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE); $this->semester = Semester::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE);
...@@ -632,13 +628,8 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -632,13 +628,8 @@ class Admin_CourseplanningController extends AuthenticatedController
$stgteile = StudiengangTeil::getAllEnriched('fach_name','ASC', ['mvv_fach_inst.institut_id' => $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT]); $stgteile = StudiengangTeil::getAllEnriched('fach_name','ASC', ['mvv_fach_inst.institut_id' => $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT]);
$sidebar = Sidebar::Get(); $sidebar = Sidebar::Get();
$list = new SelectWidget(_('Studiengangteil'), $this->url_for('admin/courseplanning/set_selection/' . $this->selected_weekday), 'stgteil_select'); $list = new SelectWidget(_('Studiengangteil'), $this->url_for('admin/courseplanning/set_selection/' . $this->selected_weekday), 'stgteil_select');
if ($this->selected_weekday) { $list->addElement(new SelectElement('all', _('Alle')), 'stgteil_select-all');
$list->addElement(new SelectElement('all', _('Alle')), 'stgteil_select-all');
}
foreach ($stgteile as $stgteil) { foreach ($stgteile as $stgteil) {
if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL || ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL == 'all' && !$this->selected_weekday)) {
$GLOBALS['user']->cfg->store('MY_COURSES_SELECTED_STGTEIL', $stgteil->id);
}
$list->addElement(new SelectElement( $list->addElement(new SelectElement(
$stgteil->id, $stgteil->id,
$stgteil->getDisplayName(), $stgteil->getDisplayName(),
......
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