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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-09-28 19:24:48 +01:00
parent 3de656f5c6 f16e81e0e8
commit 581e56198c
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ class AssetModelsController extends Controller
'requestable', 'requestable',
'assets_count', 'assets_count',
'category', 'category',
'fieldset',
]; ];
$assetmodels = AssetModel::select([ $assetmodels = AssetModel::select([
@ -94,6 +95,9 @@ class AssetModelsController extends Controller
case 'category': case 'category':
$assetmodels->OrderCategory($order); $assetmodels->OrderCategory($order);
break; break;
case 'fieldset':
$assetmodels->OrderFieldset($order);
break;
default: default:
$assetmodels->orderBy($sort, $order); $assetmodels->orderBy($sort, $order);
break; break;

5
app/Models/AssetModel.php
View file

@ -291,4 +291,9 @@ class AssetModel extends SnipeModel
{ {
return $query->leftJoin('categories', 'models.category_id', '=', 'categories.id')->orderBy('categories.name', $order); return $query->leftJoin('categories', 'models.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
} }
public function scopeOrderFieldset($query, $order)
{
return $query->leftJoin('custom_fieldsets', 'models.fieldset_id', '=', 'custom_fieldsets.id')->orderBy('custom_fieldsets.name', $order);
}
} }