mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
More graceful error message if log doesn’t exist
This commit is contained in:
parent
521f4facd5
commit
d49a1ea304
|
@ -2,8 +2,8 @@
|
|||
|
||||
{{-- Page title --}}
|
||||
@section('title')
|
||||
View Assets for {{ $user->fullName() }}
|
||||
@parent
|
||||
View Assets for {{ $user->fullName() }}
|
||||
@parent
|
||||
@stop
|
||||
|
||||
{{-- Account page content --}}
|
||||
|
@ -71,7 +71,7 @@ View Assets for {{ $user->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
@ -126,7 +126,7 @@ View Assets for {{ $user->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
@ -172,7 +172,7 @@ View Assets for {{ $user->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
@ -217,8 +217,8 @@ View Assets for {{ $user->fullName() }}
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
|
||||
|
@ -264,14 +264,14 @@ View Assets for {{ $user->fullName() }}
|
|||
{{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
|
||||
</td>
|
||||
<td>
|
||||
@if ($log->itemType()=="asset")
|
||||
@if (($log->item) && ($log->itemType()=="asset"))
|
||||
@if ($log->item->deleted_at=='')
|
||||
{{ $log->item->showAssetName() }}
|
||||
@else
|
||||
<del>{{ $log->item->showAssetName() }}</del> (deleted)
|
||||
@endif
|
||||
|
||||
@elseif (!is_null($log->itemType()))
|
||||
@elseif ($log->item)
|
||||
@if ($log->item->deleted_at=='')
|
||||
{{ $log->item->name }}
|
||||
@else
|
||||
|
@ -305,7 +305,7 @@ View Assets for {{ $user->fullName() }}
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
Loading…
Reference in a new issue