Skip to content
Snippets Groups Projects
Commit 4726723a authored by Viktoria Wiebe's avatar Viktoria Wiebe Committed by Jan-Hendrik Willms
Browse files

fix #379 - allow admins to access/view invisible users

Closes #379
parent 209aabc2
No related branches found
No related tags found
No related merge requests found
...@@ -148,7 +148,7 @@ class Resources_ResourceController extends AuthenticatedController ...@@ -148,7 +148,7 @@ class Resources_ResourceController extends AuthenticatedController
protected function getPermissionUserSearch() protected function getPermissionUserSearch()
{ {
return QuickSearch::get( return QuickSearch::get(
'searched_user_id', new StandardSearch('user_id')); 'searched_user_id', new PermissionSearch('user'));
} }
......
...@@ -139,7 +139,6 @@ class PermissionSearch extends SQLSearch { ...@@ -139,7 +139,6 @@ class PermissionSearch extends SQLSearch {
AND auth_user_md5.user_id NOT IN (:exclude_user) AND auth_user_md5.user_id NOT IN (:exclude_user)
AND {$visibility_condition} AND {$visibility_condition}
ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username"; ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
break;
case 'user_inst': case 'user_inst':
return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')') return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
FROM auth_user_md5 FROM auth_user_md5
...@@ -202,6 +201,9 @@ class PermissionSearch extends SQLSearch { ...@@ -202,6 +201,9 @@ class PermissionSearch extends SQLSearch {
if (in_array($this->search, ['user_not_already_in_sem', 'user_inst_not_already_in_sem'])) { if (in_array($this->search, ['user_not_already_in_sem', 'user_inst_not_already_in_sem'])) {
$data[':sem_perm'] = ['autor', 'tutor', 'dozent']; $data[':sem_perm'] = ['autor', 'tutor', 'dozent'];
} }
if (in_array($this->search, ['user', 'user_inst'])) {
$data[':permission'] = ['autor', 'tutor', 'dozent', 'admin'];
}
return $data; return $data;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment