From 474e636b18c39c69ad7fd83906a8c1f9b241bf74 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 20 Aug 2019 11:49:34 +0200
Subject: [PATCH] FEAT #11312 TIME 0:05 Labelled substitute 2
---
src/app/user/controllers/UserController.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index 33628084a9..6ca1fdb780 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -60,9 +60,6 @@ class UserController
foreach ($users as $key => $user) {
$users[$key]['substitute'] = !empty($user['substitute']);
- if (!empty($user['substitute'])) {
- $users[$key]['substituteUser'] = UserModel::getLabelledUserById(['id' => $user['substitute']]);
- }
}
return $response->withJson(['users' => $users]);
@@ -619,6 +616,9 @@ class UserController
$user['preferences'] = json_decode($user['preferences'], true);
$user['availableLanguages'] = LanguageController::getAvailableLanguages();
$user['administrativePrivileges'] = PrivilegeController::getAdministrativePrivilegesByUserId(['userId' => $args['id']]);
+ if (!empty($user['substitute'])) {
+ $users['substituteUser'] = UserModel::getLabelledUserById(['id' => $user['substitute']]);
+ }
}
return $user;
--
GitLab