From 4d67c72eea79eb151cf348c7fc813c90b2d1a406 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Thu, 28 Sep 2023 12:26:23 -0500 Subject: [PATCH 1/2] scope and switch case in api --- app/Http/Controllers/Api/AssetModelsController.php | 3 +++ app/Models/AssetModel.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index c1c46538d..d29de43f7 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -94,6 +94,9 @@ class AssetModelsController extends Controller case 'category': $assetmodels->OrderCategory($order); break; + case 'fieldset': + $assetmodels->OrderFieldset($order); + break; default: $assetmodels->orderBy($sort, $order); break; diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index e0b056fc9..f94c6f8ea 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -291,4 +291,9 @@ class AssetModel extends SnipeModel { 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); + } } From a54fab5c338ee2dcf2695b62ccc2001bebc89484 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Thu, 28 Sep 2023 13:02:12 -0500 Subject: [PATCH 2/2] add fieldset to allowed_columns --- app/Http/Controllers/Api/AssetModelsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index d29de43f7..e77c648b3 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -46,6 +46,7 @@ class AssetModelsController extends Controller 'requestable', 'assets_count', 'category', + 'fieldset', ]; $assetmodels = AssetModel::select([