Merge pull request #13678 from spencerrlongg/bug/sc-23596

Fieldset Properly Sortable in Asset Models Table
snipe · Sep 28, 2023 · f16e81e · f16e81e
2 parents 3b4004a + a54fab5
commit f16e81e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
@@ -46,6 +46,7 @@ public function index(Request $request)
                 'requestable',
                 'assets_count',
                 'category',
+                'fieldset',
             ];
 
         $assetmodels = AssetModel::select([
@@ -94,6 +95,9 @@ public function index(Request $request)
             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
@@ -291,4 +291,9 @@ public function scopeOrderCategory($query, $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);
+    }
 }