lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

More graceful error message if log doesn’t exist

Browse source
This commit is contained in:
snipe 2016-12-01 06:05:14 -08:00
parent 521f4facd5
commit d49a1ea304
1 changed files with 297 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
resources/views/account/view-assets.blade.php
View file

@ -2,8 +2,8 @@
{{-- Page title --}} {{-- Page title --}}
@section('title') @section('title')
View Assets for {{ $user->fullName() }} View Assets for {{ $user->fullName() }}
@parent @parent
@stop @stop
{{-- Account page content --}} {{-- Account page content --}}
@ -71,7 +71,7 @@ View Assets for {{ $user->fullName() }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -126,7 +126,7 @@ View Assets for {{ $user->fullName() }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -172,7 +172,7 @@ View Assets for {{ $user->fullName() }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -217,8 +217,8 @@ View Assets for {{ $user->fullName() }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="box box-default"> <div class="box box-default">
@ -264,14 +264,14 @@ View Assets for {{ $user->fullName() }}
{{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }} {{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
</td> </td>
<td> <td>
@if ($log->itemType()=="asset") @if (($log->item) && ($log->itemType()=="asset"))
@if ($log->item->deleted_at=='') @if ($log->item->deleted_at=='')
{{ $log->item->showAssetName() }} {{ $log->item->showAssetName() }}
@else @else
<del>{{ $log->item->showAssetName() }}</del> (deleted) <del>{{ $log->item->showAssetName() }}</del> (deleted)
@endif @endif
@elseif (!is_null($log->itemType())) @elseif ($log->item)
@if ($log->item->deleted_at=='') @if ($log->item->deleted_at=='')
{{ $log->item->name }} {{ $log->item->name }}
@else @else
@ -305,7 +305,7 @@ View Assets for {{ $user->fullName() }}
@endif @endif
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@stop @stop