Skip to content
Snippets Groups Projects
Verified Commit 474e636b authored by Damien's avatar Damien
Browse files

FEAT #11312 TIME 0:05 Labelled substitute 2

parent 7b6e784e
No related branches found
No related tags found
No related merge requests found
...@@ -60,9 +60,6 @@ class UserController ...@@ -60,9 +60,6 @@ class UserController
foreach ($users as $key => $user) { foreach ($users as $key => $user) {
$users[$key]['substitute'] = !empty($user['substitute']); $users[$key]['substitute'] = !empty($user['substitute']);
if (!empty($user['substitute'])) {
$users[$key]['substituteUser'] = UserModel::getLabelledUserById(['id' => $user['substitute']]);
}
} }
return $response->withJson(['users' => $users]); return $response->withJson(['users' => $users]);
...@@ -619,6 +616,9 @@ class UserController ...@@ -619,6 +616,9 @@ class UserController
$user['preferences'] = json_decode($user['preferences'], true); $user['preferences'] = json_decode($user['preferences'], true);
$user['availableLanguages'] = LanguageController::getAvailableLanguages(); $user['availableLanguages'] = LanguageController::getAvailableLanguages();
$user['administrativePrivileges'] = PrivilegeController::getAdministrativePrivilegesByUserId(['userId' => $args['id']]); $user['administrativePrivileges'] = PrivilegeController::getAdministrativePrivilegesByUserId(['userId' => $args['id']]);
if (!empty($user['substitute'])) {
$users['substituteUser'] = UserModel::getLabelledUserById(['id' => $user['substitute']]);
}
} }
return $user; return $user;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment