From 53c3106198a4bb2f67c4652ea948c9efae21ac9f Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 8 Feb 2023 11:43:52 +0100 Subject: [PATCH] wip #5718 @1 --- src/app/Permissions.php | 4 +++- src/resources/views/columns/users.blade.php | 23 +++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/app/Permissions.php b/src/app/Permissions.php index 599d9a6..1dd691c 100644 --- a/src/app/Permissions.php +++ b/src/app/Permissions.php @@ -27,6 +27,7 @@ class Permissions 'managedCompanies' => [], 'managedUsers' => [], 'userNames' => [], + 'enabledUsers' => [], ]; foreach (User::withoutGlobalScopes()->get() as $user) { @@ -38,6 +39,7 @@ class Permissions $data['companyUsers'][$user->company][] = $user->id; $data['usersCompany'][$user->id] = $user->company; $data['userNames'][$user->id] = $user->name; + $data['enabledUsers'][$user->id] = $user->enabled; } foreach (Company::withoutGlobalScopes()->get() as $company) { @@ -154,7 +156,7 @@ class Permissions $res = []; foreach ($ids as $id) { if (isset($data['userNames'][$id])) { - $res[$id] = $data['userNames'][$id]; + $res[$id] = ['name' => $data['userNames'][$id], 'enabled' => $data['enabledUsers'][$id]]; } } return $res; diff --git a/src/resources/views/columns/users.blade.php b/src/resources/views/columns/users.blade.php index 2e78aad..6d9b43b 100644 --- a/src/resources/views/columns/users.blade.php +++ b/src/resources/views/columns/users.blade.php @@ -1,12 +1,27 @@ {{-- regular object attribute --}} @php $c=[]; - foreach ($entry->getUsers() as $id=>$name) { - $c[]=''.$name.' '; + $c_disabled=[]; + foreach ($entry->getUsers() as $id=>$data) { + $user=''; + $name=$data['name']?:''.__('Indéfini').''; + $disabled=!$data['enabled']?' class="user_disabled"':''; + $user.=''; + $user.=''.$name.' '; + if($data['enabled']){ + $user.=' '; + $user.=' '; + } + $user.=''; + + if($data['enabled']){ + $c[]=$user; + }else{ + $c_disabled[]=$user; + } } - $chunked=array_chunk($c,4); + $chunked=array_chunk(array_merge($c,$c_disabled),4); $c=[]; foreach ($chunked as $item) { $c[]=implode(', ',$item); -- 2.39.5