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

Additional fields for asset models

Browse source
This commit is contained in:
snipe 2017-01-13 08:39:02 -08:00
parent 34f427920b
commit ae540af2a9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/AssetModelsController.php
View file

@ -28,8 +28,8 @@ class AssetModelsController extends Controller
$this->authorize('view', AssetModel::class);
$allowed_columns = ['id','name','created_at'];
$assetmodels = AssetModel::select(['id','name','model_number','created_at'])
->with('category','depreciation', 'manufacturer')
$assetmodels = AssetModel::select(['id','image','name','model_number','eol','notes','created_at'])
->with('category','depreciation', 'manufacturer','fieldset')
->withCount('assets');
if ($request->has('search')) {

6
resources/views/models/index.blade.php
View file

@ -40,13 +40,13 @@
<th data-sortable="true" data-field="image" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
<th data-sortable="false" data-field="manufacturer">{{ trans('general.manufacturer') }}</th>
<th data-sortable="true" data-field="name">{{ trans('admin/models/table.title') }}</th>
<th data-sortable="true" data-field="modelnumber">{{ trans('admin/models/table.modelnumber') }}</th>
<th data-sortable="false" data-field="numassets">{{ trans('admin/models/table.numassets') }}</th>
<th data-sortable="true" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
<th data-sortable="false" data-field="assets_count">{{ trans('admin/models/table.numassets') }}</th>
<th data-sortable="false" data-field="depreciation">{{ trans('general.depreciation') }}</th>
<th data-sortable="false" data-field="category">{{ trans('general.category') }}</th>
<th data-sortable="true" data-field="eol">{{ trans('general.eol') }}</th>
<th data-sortable="false" data-field="fieldset">{{ trans('admin/models/general.fieldset') }}</th>
<th data-sortable="false" data-field="note">{{ trans('general.notes') }}</th>
<th data-sortable="false" data-field="notes">{{ trans('general.notes') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>