revision trait fix getSystemUserId

ProVisionBG · Dec 12, 2016 · 9885e6e · 9885e6e
1 parent b7686b6
commit 9885e6e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/Traits/RevisionableTrait.php b/app/Traits/RevisionableTrait.php
@@ -257,13 +257,20 @@ private function isRevisionable($key)
      **/
     public function getSystemUserId()
     {
+
         if (\ProVision\Administration\Administration::routeInAdministration()) {
             $this->guard = 'provision_administration';
         } else {
             $this->guard = 'web';
         }
 
-        return \Auth::guard($this->guard)->user()->id;
+
+        if (\Auth::guard($this->guard)->check()) {
+            return \Auth::guard($this->guard)->user()->id;
+        }
+
+        return null;
+
 //
 //        try {
 //            if (class_exists($class = '\SleepingOwl\AdminAuth\Facades\AdminAuth')

diff --git a/resources/views/empty-form.blade.php b/resources/views/empty-form.blade.php
@@ -36,10 +36,10 @@
                         @foreach($revData->sortBy('created_at')->reverse() as $history)
                             <li>
                                 @if($history->key == 'created_at' && !$history->old_value)
-                                    <b>{{ $history->userResponsible()->name }}</b> created this resource
+                                    <b>{{ @$history->userResponsible()->name }}</b> created this resource
                                     at {{ $history->newValue() }}
                                 @else
-                                    <b>{{ $history->userResponsible()->name }}</b> changed
+                                    <b>{{ @$history->userResponsible()->name }}</b> changed
                                     <b>{{trans($form->getModel()->module.'::admin.'.$history->fieldName())  }}</b>
                                     from <b>{{ $history->oldValue() }}</b> to <b>{{ $history->newValue() }}</b>
                                 @endif