wait #5944 @0.25

diff --git a/src/app/Models/User.php b/src/app/Models/User.php
index e2f2522f7ef176f5fe25d13957b146d19dc97d91..ec0c020b708c6684bc6b4b6434f6761598df24c1 100644 (file)
--- a/src/app/Models/User.php
+++ b/src/app/Models/User.php
@@ -36,7 +36,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
 
     protected static $_companyNames = null;
 
-    public function getMorphClass():string
+    public function getMorphClass(): string
     {
         return 'App\Models\AuthUser';
     }
@@ -86,7 +86,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 'label' => __('Identifiant Slack'),
                 'type' => Text::class,
                 'tab' => __('Equipe Cubedesigners'),
-                'can'=>'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -94,7 +94,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 'label' => __('Trigramme Oxygene'),
                 'type' => Text::class,
                 'tab' => __('Equipe Cubedesigners'),
-                'can'=>'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -102,7 +102,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 'label' => __('Couleur plannings'),
                 'type' => Color::class,
                 'tab' => __('Equipe Cubedesigners'),
-                 'can'=>'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -119,7 +119,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 1 => __('Equipier'),
                 2 => __('Admin'),
                 3 => __('Comptable')],
-            'can'=>'user:admin',
+            'can' => 'user:admin',
             'tab' => 'Extranet V1']);
 
         $this->addField(['name' => 'c_ca',
@@ -128,7 +128,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
             'tab' => __('Chiffres'),
             'column' => true,
             'read_only' => true,
-            'can'=>'user:admin',
+            'can' => 'user:admin',
         ]);
 
         $this->addField(['name' => 'toolbox_settings',
@@ -167,6 +167,9 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
         if ($name === '') {
             return $this->companyName;
         }
+        if (!is_string($name) || !is_string($this->companyName)) {
+            dd($name, $this->companyName);
+        }
         return $name . ' (' . $this->companyName . ')';
     }
 
@@ -208,6 +211,9 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
 
     public function getCompanyNameAttribute()
     {
+        if (null === $this->company) {
+            return '';
+        }
         return self::_getCompanyNames($this->company);
     }