From d7b6e71bca1a8e851d0acd4ac585a32e48c7b041 Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Wed, 23 Feb 2022 15:28:31 +0000
Subject: [PATCH] - Fix Controller global

---
 app/Http/Controllers/Controller.php  | 12 +++++++-----
 resources/views/layout/nav.blade.php |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 12c5d62..f0f03b1 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -44,14 +44,16 @@ class Controller extends BaseController
             ]
         );
 
-        if (!Auth::user()->isAdmin()) {
+
+        $user = Auth::user();
+        if (!is_null($user) && !$user->isAdmin()) {
             $ticketsNew = $ticketsNew->where('is_internal', 0)->whereNotIn('site_id', $ignore);
             $ticketsWaiting = $ticketsWaiting->where('is_internal', 0)->whereNotIn('site_id', $ignore);
             $ticketsInProgress = $ticketsInProgress->where('is_internal', 0)->whereNotIn('site_id', $ignore);
-        }
 
-        View::share('ticketsNew', $ticketsNew->count());
-        View::share('ticketsWaiting', $ticketsWaiting->count());
-        View::share('ticketsInProgress', $ticketsInProgress->count());
+            View::share('ticketsNew', $ticketsNew->count());
+            View::share('ticketsWaiting', $ticketsWaiting->count());
+            View::share('ticketsInProgress', $ticketsInProgress->count());
+        }
     }
 }
diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php
index 60cc0dc..96593fc 100644
--- a/resources/views/layout/nav.blade.php
+++ b/resources/views/layout/nav.blade.php
@@ -34,10 +34,10 @@
                     <span class="nav-link text-info fw-bold">{{ __('Tickets') }}</span>
                 </li>
                 <li class="nav-item">
-                    <span class="nav-link text-light">{{ __('Nouveau') }}&nbsp;:&nbsp;<span class="text-info">{{ $ticketsNew }}</span></span>
+                    <span class="nav-link text-light">{{ __('Nouveau') }}&nbsp;:&nbsp;<span class="text-info">{{ $ticketsNew ?? 0 }}</span></span>
                 </li>
                 <li class="nav-item">
-                    <span class="nav-link text-light">{{ __('En cours') }}&nbsp;:&nbsp;<span class="text-info">{{ $ticketsInProgress }}</span></span>
+                    <span class="nav-link text-light">{{ __('En cours') }}&nbsp;:&nbsp;<span class="text-info">{{ $ticketsInProgress ?? 0 }}</span></span>
                 </li>
                 <li class="nav-item">
                     @include('modules.loadLevel')