DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fixes #2387

Browse source
This commit is contained in:
snipe 2016-08-02 17:03:15 -07:00
parent 1ca5f8bee5
commit 29eadb10ae
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -298,24 +298,32 @@
@if (isset($asset->userloc)) @if (isset($asset->userloc))
<li>{{ $asset->userloc->name }} <li>{{ $asset->userloc->name }}
<li>{{ $asset->userloc->address }} <li>{{ $asset->userloc->address }}
@if (isset($asset->userloc->address2)) @if ($asset->userloc->address2!='')
{{ $asset->userloc->address2 }} {{ $asset->userloc->address2 }}
@endif @endif
</li> </li>
@if (isset($asset->assetloc->city))
<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li> <li>{{ $asset->userloc->city }}
@if (($asset->userloc->city!='') && ($asset->userloc->state!=''))
,
@endif @endif
{{ $asset->userloc->state }} {{ $asset->userloc->zip }}</li>
@elseif (isset($asset->assetloc)) @elseif (isset($asset->assetloc))
<li>{{ $asset->assetloc->name }} <li>{{ $asset->assetloc->name }}
<li>{{ $asset->assetloc->address }} <li>{{ $asset->assetloc->address }}
@if (isset($asset->assetloc->address2)) @if ($asset->assetloc->address2!='')
{{ $asset->assetloc->address2 }} {{ $asset->assetloc->address2 }}
@endif @endif
</li> </li>
@if (isset($asset->assetloc->city))
<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li> <li>{{ $asset->assetloc->city }}
@if (($asset->assetloc->city!='') && ($asset->assetloc->state!=''))
,
@endif @endif
{{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
@endif @endif
</ul> </ul>