diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 59b9ef77e1..53df8bd1e2 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -152,6 +152,8 @@ {{ $activity->componentlog->name }} @elseif (($activity->assetlog) && ($activity->action_type=="uploaded")) {{ $activity->assetlog->showAssetName() }} + @elseif (($activity->userlog) && ($activity->action_type=="uploaded")) + {{ $activity->userlog->fullName() }} @else {{ trans('general.bad_data') }} @endif diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index c832048098..88d5c635ef 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -442,7 +442,18 @@ @endif - {{ $log->adminlog->fullName() }} + @if ($log->adminlog) + + @if ($log->adminlog->deleted_at=='') + + {{ $log->adminlog->fullName() }} + + @else + {{ $log->adminlog->fullName() }} + @endif + @else + Deleted User + @endif @endforeach