Skip to content
Snippets Groups Projects
Commit a756b099 authored by Rasmus Fuhse's avatar Rasmus Fuhse
Browse files

Resolve "Verwaltung von Veranstaltungen: Lehrendenfilter wird angewendet,...

Resolve "Verwaltung von Veranstaltungen: Lehrendenfilter wird angewendet, obwohl das nicht angezeigt wird"

Closes #4053

Merge request studip/studip!2946
parent 27b72211
No related branches found
No related tags found
No related merge requests found
...@@ -535,12 +535,42 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -535,12 +535,42 @@ class Admin_CoursesController extends AuthenticatedController
if (isset($filters[$key])) { if (isset($filters[$key])) {
$config->store($field, $filters[$key]); $config->store($field, $filters[$key]);
} }
unset($filters[$key]);
}
if ($config->ADMIN_COURSES_TEACHERFILTER) {
if (!$config->MY_INSTITUTES_DEFAULT) { if (!$config->MY_INSTITUTES_DEFAULT) {
$config->delete('ADMIN_COURSES_TEACHERFILTER'); $config->delete('ADMIN_COURSES_TEACHERFILTER');
} else {
$exists = InstituteMember::countBySQL("INNER JOIN `auth_user_md5` USING (`user_id`) WHERE `user_inst`.`user_id` = :user_id AND `user_inst`.`Institut_id` = :institut_id AND `auth_user_md5`.`perms` = 'dozent' ", [
'user_id' => $config->ADMIN_COURSES_TEACHERFILTER,
'institut_id' => $config->MY_INSTITUTES_DEFAULT
]) > 0;
if (!$exists) {
$config->delete('ADMIN_COURSES_TEACHERFILTER');
}
}
}
if ($config->MY_COURSES_SELECTED_STGTEIL) {
if (!$config->MY_INSTITUTES_DEFAULT) {
$config->delete('MY_COURSES_SELECTED_STGTEIL'); $config->delete('MY_COURSES_SELECTED_STGTEIL');
} else {
$statement = DBManager::get()->prepare("
SELECT 1
FROM `mvv_stg_stgteil`
INNER JOIN `mvv_studiengang` ON (`mvv_stg_stgteil`.`studiengang_id` = `mvv_studiengang`.`studiengang_id`)
WHERE `mvv_studiengang`.`institut_id` = :institut_id
AND `mvv_stg_stgteil`.`stgteil_id` = :stgteil_id
");
$statement->execute([
'institut_id' => $config->MY_INSTITUTES_DEFAULT,
'stgteil_id' => $config->MY_COURSES_SELECTED_STGTEIL
]);
$exists = (bool) $statement->fetch(PDO::FETCH_COLUMN);
if (!$exists) {
$config->delete('MY_COURSES_SELECTED_STGTEIL');
}
} }
unset($filters[$key]);
} }
// Datafield filters // Datafield filters
......
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