ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make eol, notes sortable on asset model

Browse Source
This commit is contained in:
snipe
2017-01-13 08:41:17 -08:00
parent ae540af2a9
commit edca6ad19d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/AssetModelsController.php
+1 -1
View File
@@ -26,7 +26,7 @@ class AssetModelsController extends Controller
public function index(Request $request)
{
$this->authorize('view', AssetModel::class);
$allowed_columns = ['id','name','created_at'];
$allowed_columns = ['id','image','name','model_number','eol','notes','created_at'];
$assetmodels = AssetModel::select(['id','image','name','model_number','eol','notes','created_at'])
->with('category','depreciation', 'manufacturer','fieldset')
resources/views/models/index.blade.php
+1 -1
View File
@@ -46,7 +46,7 @@
<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="notes">{{ trans('general.notes') }}</th>
<th data-sortable="true" 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>