Skip to content
Snippets Groups Projects
Commit 28ee68e9 authored by André Noack's avatar André Noack Committed by Jan-Hendrik Willms
Browse files

Resolve "Verwaltung von Veranstaltungen: Duplikate im Lehrendenfilter"

Closes #4054 and #4107

Merge request studip/studip!2955
parent 75540bab
No related branches found
No related tags found
No related merge requests found
......@@ -527,6 +527,7 @@ class Admin_CoursesController extends AuthenticatedController
'institut_id' => 'MY_INSTITUTES_DEFAULT',
];
if (!empty($filters['institut_id'])) {
$config->store(
'MY_INSTITUTES_INCLUDE_CHILDREN',
str_contains($filters['institut_id'], '_') ? 1 : 0
......@@ -534,6 +535,7 @@ class Admin_CoursesController extends AuthenticatedController
if ($config->MY_INSTITUTES_INCLUDE_CHILDREN) {
$filters['institut_id'] = substr($filters['institut_id'], 0, strpos($filters['institut_id'], '_'));
}
}
foreach ($mapping as $key => $field) {
if (isset($filters[$key])) {
......@@ -1710,6 +1712,8 @@ class Admin_CoursesController extends AuthenticatedController
if (str_contains($institut_id, '_')) {
$institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
}
$teachers = [];
if ($institut_id) {
$teachers = DBManager::get()->fetchAll("
SELECT auth_user_md5.*, user_info.*
FROM auth_user_md5
......@@ -1718,6 +1722,7 @@ class Admin_CoursesController extends AuthenticatedController
INNER JOIN Institute ON (Institute.Institut_id = user_inst.Institut_id)
WHERE (Institute.Institut_id = :institut_id OR Institute.fakultaets_id = :institut_id)
AND auth_user_md5.perms = 'dozent'
GROUP BY auth_user_md5.user_id
ORDER BY auth_user_md5.Nachname ASC, auth_user_md5.Vorname ASC
", [
'institut_id' => $institut_id
......@@ -1729,7 +1734,7 @@ class Admin_CoursesController extends AuthenticatedController
return $ret;
}
);
}
$list = new SelectWidget(_('Lehrendenfilter'), $this->url_for('admin/courses/index'), 'teacher_filter');
if (!$institut_id || $institut_id === 'all') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment