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

Allow sorting on admin name in API

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-11-13 18:23:26 +00:00
parent 1aef7edc43
commit d3602c0595
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ class AssetModelsController extends Controller
'model_number', 'model_number',
'min_amt', 'min_amt',
'eol', 'eol',
'created_by',
'requestable', 'requestable',
'models.notes', 'models.notes',
'models.created_at', 'models.created_at',
@ -69,7 +70,7 @@ class AssetModelsController extends Controller
'models.deleted_at', 'models.deleted_at',
'models.updated_at', 'models.updated_at',
]) ])
->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues','adminuser') ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
->withCount('assets as assets_count'); ->withCount('assets as assets_count');
if ($request->input('status')=='deleted') { if ($request->input('status')=='deleted') {
@ -95,7 +96,7 @@ class AssetModelsController extends Controller
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';
switch ($sort) { switch ($request->input('sort')) {
case 'manufacturer': case 'manufacturer':
$assetmodels->OrderManufacturer($order); $assetmodels->OrderManufacturer($order);
break; break;
@ -105,6 +106,9 @@ class AssetModelsController extends Controller
case 'fieldset': case 'fieldset':
$assetmodels->OrderFieldset($order); $assetmodels->OrderFieldset($order);
break; break;
case 'created_by':
$assetmodels->OrderByCreatedByName($order);
break;
default: default:
$assetmodels->orderBy($sort, $order); $assetmodels->orderBy($sort, $order);
break; break;