iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix user sorting on angeltype page (#1144)

This commit is contained in:
xuwhite 2023-05-19 16:09:25 +02:00 committed by GitHub
parent 063e9a8ec2
commit 9bd3978257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/controller/angeltypes_controller.php
View File

@ -171,8 +171,7 @@ function angeltype_controller()
$angeltype = AngelType::findOrFail(request()->input('angeltype_id'));
/** @var UserAngelType $user_angeltype */
$user_angeltype = UserAngelType::whereUserId($user->id)->where('angel_type_id', $angeltype->id)->first();
$members = $angeltype->userAngelTypes->sortBy('name');
$members = $angeltype->userAngelTypes->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE);
$days = angeltype_controller_shiftsFilterDays($angeltype);
$shiftsFilter = angeltype_controller_shiftsFilter($angeltype, $days);
if (request()->input('showFilledShifts')) {

2
resources/lang/de_DE/default.po
View File

@ -994,7 +994,7 @@ msgid "The following angels are needed"
msgstr "Die folgenden Engel werden benötigt"
msgid "All Angels"
msgstr "Engelliste"
msgstr "Alle Engel"
msgid "This user does not exist."
msgstr "Benutzer existiert nicht."