wip #5718 @1

diff --git a/src/app/Permissions.php b/src/app/Permissions.php
index 599d9a6ea06886becd42b94fa063a5b65057ebc4..1dd691c4688fcd9afc37b16a8abb3d03f42d61b0 100644 (file)
--- 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 2e78aadb0877b5f29bdeaeb66461d768b14cc61c..6d9b43b52a59b9b9e0d7e9d0b1007b0f0f6bddf3 100644 (file)
--- 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[]='<a data-featherlight="iframe" data-featherlight-iframe-style="display:block;width:85vw;height:85vh;" href="'.backpack_url('users/'.$id.'/edit?embeded=1').'">'.$name.' <i class="la la-edit"></i></a> <a title="'.__('Se connecter comme').'" href="'.backpack_url('users/'.$id.'/loginas').'"><i
-                                class="las la-key"></i></a>';
+    $c_disabled=[];
+    foreach ($entry->getUsers() as $id=>$data) {
+        $user='';
+        $name=$data['name']?:'<i>'.__('Indéfini').'</i>';
+        $disabled=!$data['enabled']?' class="user_disabled"':'';
+        $user.='<span'.$disabled.'>';
+        $user.='<a data-featherlight="iframe" data-featherlight-iframe-style="display:block;width:85vw;height:85vh;" href="'.backpack_url('users/'.$id.'/edit?embeded=1').'">'.$name.' <i class="la la-edit"></i></a> ';
+        if($data['enabled']){
+            $user.='<a title="'.__('Se connecter comme').'" href="'.backpack_url('users/'.$id.'/loginas').'"><i class="las la-key"></i></a> ';
+            $user.='<a title="'.__('Transférer des fichiers').'" href="'.backpack_url('files/'.$id).'"><i class="las la-cloud"></i></a> ';
+        }
+        $user.='</span>';
+
+        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);