DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup checkedout to part of asset view.

Browse source
This commit is contained in:
Daniel Meltzer 2016-12-29 09:56:19 -05:00
parent 8cc695b65f
commit 7ccd71978c
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
resources/views/hardware/view.blade.php
View file

@ -347,7 +347,7 @@
<img src="{{ url('/') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;"> <img src="{{ url('/') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;">
@endif @endif
@if (($asset->assignedTo) && ($asset->assigned_to > 0) && ($asset->deleted_at=='')) @if (($asset->assignedTo) && ($asset->deleted_at==''))
<h4>{{ trans('admin/hardware/form.checkedout_to') }}</h4> <h4>{{ trans('admin/hardware/form.checkedout_to') }}</h4>
<p> <p>
@if($asset->assigned_type == User::class) <!-- Only users have avatars currently--> @if($asset->assigned_type == User::class) <!-- Only users have avatars currently-->
@ -365,37 +365,20 @@
<li><i class="fa fa-phone"></i> {{ $asset->assigneduser->phone }}</li> <li><i class="fa fa-phone"></i> {{ $asset->assigneduser->phone }}</li>
@endif @endif
@if (isset($asset->userloc)) @if (isset($asset->assetLoc))
<li>{{ $asset->userloc->name }}</li> <li>{{ $asset->assetLoc->name }}</li>
<li>{{ $asset->userloc->address }} <li>{{ $asset->assetLoc->address }}
@if ($asset->userloc->address2!='') @if ($asset->assetLoc->address2!='')
{{ $asset->userloc->address2 }} {{ $asset->assetLoc->address2 }}
@endif @endif
</li> </li>
<li>{{ $asset->userloc->city }} <li>{{ $asset->assetLoc->city }}
@if (($asset->userloc->city!='') && ($asset->userloc->state!='')) @if (($asset->assetLoc->city!='') && ($asset->assetLoc->state!=''))
, ,
@endif @endif
{{ $asset->userloc->state }} {{ $asset->userloc->zip }} {{ $asset->assetLoc->state }} {{ $asset->assetLoc->zip }}
</li> </li>
@elseif (isset($asset->assetloc))
<li>{{ $asset->assetloc->name }}</li>
<li>{{ $asset->assetloc->address }}
@if ($asset->assetloc->address2!='')
{{ $asset->assetloc->address2 }}
@endif
</li>
<li>
{{ $asset->assetloc->city }}
@if (($asset->assetloc->city!='') && ($asset->assetloc->state!=''))
,
@endif
{{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}
</li>
@endif @endif
</ul> </ul>