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

Updated view for #2324 (#2357)

Browse source
This commit is contained in:
zjean 2016-07-29 20:55:16 +02:00 committed by snipe
parent 85232c47da
commit 108a3c9dad
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/views/account/requestable-assets.blade.php
View file

@ -26,10 +26,12 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr role="row"> <tr role="row">
<th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th> <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
<th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.serial') }}</th> <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.serial') }}</th>
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.location') }}</th> <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.location') }}</th>
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.status') }}</th>
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
<th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th> <th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
</tr> </tr>
</thead> </thead>
@ -44,15 +46,28 @@
@endif @endif
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td> <td>
@if ($asset->assigneduser && $asset->assetloc) @if ($asset->assigneduser && $asset->assetloc)
{{ $asset->assetloc->name }} {{ $asset->assetloc->name }}
@elseif ($asset->defaultLoc) @elseif ($asset->defaultLoc)
{{ $asset->defaultLoc->name }} {{ $asset->defaultLoc->name }}
@endif @endif
</td> </td>
@if ($asset->assigned_to != '' && $asset->assigned_to > 0)
<td>Checked out</td>
@else
<td>{{ trans('admin/hardware/general.requestable') }}</td>
@endif
<td>{{ $asset->expected_checkin }}</td>
<td> <td>
<a href="{{ route('account/request-asset', $asset->id) }}" class="btn btn-info btn-sm" title="{{ trans('button.request') }}">{{ trans('button.request') }}</a> <a href="{{ route('account/request-asset', $asset->id) }}" class="btn btn-info btn-sm" title="{{ trans('button.request') }}">{{ trans('button.request') }}</a>
</td> </td>