DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #2713 - error displayed with license checked out to asset

Browse source
This commit is contained in:
snipe 2016-10-12 14:32:21 -07:00
parent 31898d0f85
commit 219ef23126
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/views/licenses/view.blade.php
View file

@ -61,7 +61,8 @@
<tr> <tr>
<td>Seat {{ $count }} </td> <td>Seat {{ $count }} </td>
<td> <td>
@if (($licensedto->assigned_to) && ($licensedto->deleted_at == NULL))
@if (($licensedto->user) && ($licensedto->deleted_at == NULL))
@can('users.view') @can('users.view')
<a href="{{ route('view/user', $licensedto->assigned_to) }}"> <a href="{{ route('view/user', $licensedto->assigned_to) }}">
{{ $licensedto->user->fullName() }} {{ $licensedto->user->fullName() }}
@ -70,9 +71,9 @@
{{ $licensedto->user->fullName() }} {{ $licensedto->user->fullName() }}
@endcan @endcan
@elseif (($licensedto->assigned_to) && ($licensedto->deleted_at != NULL)) @elseif (($licensedto->user) && ($licensedto->deleted_at != NULL))
<del>{{ $licensedto->user->fullName() }}</del> <del>{{ $licensedto->user->fullName() }}</del>
@elseif ($licensedto->asset_id) @elseif ($licensedto->asset)
@if ($licensedto->asset->assigned_to != 0) @if ($licensedto->asset->assigned_to != 0)
@can('users.view') @can('users.view')
<a href="{{ route('view/user', $licensedto->asset->assigned_to) }}"> <a href="{{ route('view/user', $licensedto->asset->assigned_to) }}">
@ -377,9 +378,17 @@
<td> <td>
@if (($log->target) && ($log->target->id!='0')) @if (($log->target) && ($log->target->id!='0'))
<a href="{{ route('view/user', $log->target_id) }}">
{{ $log->userlog->fullName() }} @if ($log->target_type == 'App\Models\User')
</a> <a href="{{ route('view/user', $log->target_id) }}">
{{ $log->userlog->fullName() }}
</a>
@elseif ($log->target_type == 'App\Models\Asset')
<a href="{{ route('view/hardware', $log->target_id) }}">
{{ $log->userlog->showAssetName() }}
</a>
@endif
@elseif ($log->action_type=='uploaded') @elseif ($log->action_type=='uploaded')