Merge pull request #17385 from grokability/17383-fix-api-route-path

Fixed #17383 - re-add `/hardware/` as an object type in the file upload API

Author: snipe

app/Http/Controllers/Api/UploadedFilesController.php

@@ -33,6 +33,7 @@ class UploadedFilesController extends Controller
         'assets' => Asset::class,
         'components' => Component::class,
         'consumables' => Consumable::class,
+        'hardware' => Asset::class,
         'licenses' => License::class,
         'locations' => Location::class,
         'models' => AssetModel::class,
@@ -44,6 +45,7 @@ class UploadedFilesController extends Controller
         'assets' => 'private_uploads/assets/',
         'components' => 'private_uploads/components/',
         'consumables' => 'private_uploads/consumables/',
+        'hardware' => 'private_uploads/assets/',
         'licenses' => 'private_uploads/licenses/',
         'locations' => 'private_uploads/locations/',
         'models' => 'private_uploads/assetmodels/',
@@ -55,6 +57,7 @@ class UploadedFilesController extends Controller
         'assets' => 'asset',
         'components' => 'component',
         'consumables' => 'consumable',
+        'hardware' => 'asset',
         'licenses' => 'license',
         'locations' => 'location',
         'models' => 'model',

routes/api.php

@@ -1314,7 +1314,7 @@
             'index'
         ]
     )->name('api.files.index')
-        ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
 
     // Get a file
     Route::get('{object_type}/{id}/files/{file_id}',
@@ -1323,7 +1323,7 @@
             'show'
         ]
     )->name('api.files.show')
-        ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
 
     // Upload files(s)
     Route::post('{object_type}/{id}/files',
@@ -1332,7 +1332,7 @@
             'store'
         ]
     )->name('api.files.store')
-        ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
 
     // Delete files(s)
     Route::delete('{object_type}/{id}/files/{file_id}/delete',
@@ -1341,6 +1341,6 @@
             'destroy'
         ]
     )->name('api.files.destroy')
-        ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
 
 }); // end API routes