diff options
| author | msquare <msquare@notrademark.de> | 2019-12-27 19:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-27 19:47:52 +0100 |
| commit | 0cab703c941e96d03072364c2082605f18245b5a (patch) | |
| tree | 44ea0e2f23db7fa5a12bc5b971c56d773ed58c9f /includes/pages/admin_free.php | |
| parent | 537179df66b1245f034e9bedeff7d74cbc6a7f5c (diff) | |
| parent | e1471248fe8f8a4fc6edef28fe702245c2fde48d (diff) | |
Merge pull request #705 from MyIgel/pronoun
User: Add pronoun statement
Diffstat (limited to 'includes/pages/admin_free.php')
| -rw-r--r-- | includes/pages/admin_free.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index fa4508c5..709954a0 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -33,7 +33,7 @@ function admin_free() } $angelType = $request->input('angeltype', ''); - $query = User::query() + $query = User::with('personalData') ->select('users.*') ->leftJoin('ShiftEntry', 'users.id', 'ShiftEntry.UID') ->leftJoin('users_state', 'users.id', 'users_state.user_id') @@ -73,10 +73,10 @@ function admin_free() foreach ($users as $usr) { if (count($tokens) > 0) { $match = false; - $index = join('', $usr->toArray()); - foreach ($tokens as $t) { - $t = trim($t); - if (!empty($t) && stristr($index, $t)) { + $index = join('', $usr->attributesToArray()); + foreach ($tokens as $token) { + $token = trim($token); + if (!empty($token) && stristr($index, $token)) { $match = true; break; } @@ -87,7 +87,7 @@ function admin_free() } $free_users_table[] = [ - 'name' => User_Nick_render($usr), + 'name' => User_Nick_render($usr) . User_Pronoun_render($usr), 'shift_state' => User_shift_state_render($usr), 'last_shift' => User_last_shift_render($usr), 'dect' => $usr->contact->dect, |