From e1471248fe8f8a4fc6edef28fe702245c2fde48d Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Thu, 26 Dec 2019 19:07:51 +0100 Subject: User: Add pronoun statement --- includes/pages/admin_active.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'includes/pages/admin_active.php') diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 71d6914a..d82b8fa9 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -149,7 +149,7 @@ function admin_active() } } - $query = User::query() + $query = User::with('personalData') ->selectRaw( sprintf( ' @@ -211,9 +211,8 @@ function admin_active() } $shirtSize = $usr->personalData->shirt_size; - $userData = []; - $userData['nick'] = User_Nick_render($usr); + $userData['nick'] = User_Nick_render($usr) . User_Pronoun_render($usr); $userData['shirt_size'] = (isset($tshirt_sizes[$shirtSize]) ? $tshirt_sizes[$shirtSize] : ''); $userData['work_time'] = round($usr['shift_length'] / 60) . ' min (' . sprintf('%.2f', $usr['shift_length'] / 3600) . ' h)'; -- cgit v1.2.3-54-g00ecf