From 7a9d2454d4db0e8248a6647f0423dac335f01f49 Mon Sep 17 00:00:00 2001 From: snipe Date: Sun, 10 Aug 2025 16:30:32 +0100 Subject: [PATCH 1/2] Move the object type mapping and such to the base controller to de-dupe Signed-off-by: snipe --- .../Api/UploadedFilesController.php | 51 ------------------- app/Http/Controllers/Controller.php | 48 +++++++++++++++++ .../Controllers/UploadedFilesController.php | 47 ----------------- 3 files changed, 48 insertions(+), 98 deletions(-) diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php index ca507d1b51f1..cab6ff99922f 100644 --- a/app/Http/Controllers/Api/UploadedFilesController.php +++ b/app/Http/Controllers/Api/UploadedFilesController.php @@ -7,19 +7,9 @@ use App\Http\Controllers\Controller; use App\Http\Requests\UploadFileRequest; use App\Http\Transformers\UploadedFilesTransformer; -use App\Models\Accessory; use App\Models\Actionlog; -use App\Models\Asset; -use App\Models\Maintenance; -use App\Models\AssetModel; -use App\Models\Component; -use App\Models\Consumable; -use App\Models\License; -use App\Models\Location; -use App\Models\User; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\StreamedResponse; @@ -28,47 +18,6 @@ class UploadedFilesController extends Controller { - static $map_object_type = [ - 'accessories' => Accessory::class, - 'maintenances' => Maintenance::class, - 'assets' => Asset::class, - 'components' => Component::class, - 'consumables' => Consumable::class, - 'hardware' => Asset::class, - 'licenses' => License::class, - 'locations' => Location::class, - 'models' => AssetModel::class, - 'users' => User::class, - ]; - - static $map_storage_path = [ - 'accessories' => 'private_uploads/accessories/', - 'maintenances' => 'private_uploads/maintenances/', - '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/', - 'users' => 'private_uploads/users/', - ]; - - static $map_file_prefix= [ - 'accessories' => 'accessory', - 'maintenances' => 'maintenance', - 'assets' => 'asset', - 'components' => 'component', - 'consumables' => 'consumable', - 'hardware' => 'asset', - 'licenses' => 'license', - 'locations' => 'location', - 'models' => 'model', - 'users' => 'user', - ]; - - - /** * List files for an object diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 74fff19a3733..fc300a5e2b55 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -22,6 +22,15 @@ namespace App\Http\Controllers; +use App\Models\Accessory; +use App\Models\Asset; +use App\Models\AssetModel; +use App\Models\Component; +use App\Models\Consumable; +use App\Models\License; +use App\Models\Location; +use App\Models\Maintenance; +use App\Models\User; use Illuminate\Support\Facades\Auth; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; @@ -32,6 +41,45 @@ abstract class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + static $map_object_type = [ + 'accessories' => Accessory::class, + 'maintenances' => Maintenance::class, + 'assets' => Asset::class, + 'components' => Component::class, + 'consumables' => Consumable::class, + 'hardware' => Asset::class, + 'licenses' => License::class, + 'locations' => Location::class, + 'models' => AssetModel::class, + 'users' => User::class, + ]; + + static $map_storage_path = [ + 'accessories' => 'private_uploads/accessories/', + 'maintenances' => 'private_uploads/maintenances/', + '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/', + 'users' => 'private_uploads/users/', + ]; + + static $map_file_prefix= [ + 'accessories' => 'accessory', + 'maintenances' => 'maintenance', + 'assets' => 'asset', + 'components' => 'component', + 'consumables' => 'consumable', + 'hardware' => 'asset', + 'licenses' => 'license', + 'locations' => 'location', + 'models' => 'model', + 'users' => 'user', + ]; + public function __construct() { view()->share('signedIn', Auth::check()); diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php index bce40f7787c2..eb1c45110db6 100644 --- a/app/Http/Controllers/UploadedFilesController.php +++ b/app/Http/Controllers/UploadedFilesController.php @@ -4,16 +4,7 @@ use App\Helpers\StorageHelper; use App\Http\Requests\UploadFileRequest; -use App\Models\Accessory; use App\Models\Actionlog; -use App\Models\Asset; -use App\Models\Maintenance; -use App\Models\AssetModel; -use App\Models\Component; -use App\Models\Consumable; -use App\Models\License; -use App\Models\Location; -use App\Models\User; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\Storage; use Symfony\Component\HttpFoundation\BinaryFileResponse; @@ -31,44 +22,6 @@ class UploadedFilesController extends Controller { - static $map_object_type = [ - 'accessories' => Accessory::class, - 'maintenances' => Maintenance::class, - 'assets' => Asset::class, - 'components' => Component::class, - 'consumables' => Consumable::class, - 'hardware' => Asset::class, - 'licenses' => License::class, - 'locations' => Location::class, - 'models' => AssetModel::class, - 'users' => User::class, - ]; - - static $map_storage_path = [ - 'accessories' => 'private_uploads/accessories/', - 'maintenances' => 'private_uploads/maintenances/', - '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/', - 'users' => 'private_uploads/users/', - ]; - - static $map_file_prefix= [ - 'accessories' => 'accessory', - 'maintenances' => 'maintenance', - 'assets' => 'asset', - 'components' => 'component', - 'consumables' => 'consumable', - 'hardware' => 'asset', - 'licenses' => 'license', - 'locations' => 'location', - 'models' => 'model', - 'users' => 'user', - ]; /** * Accepts a POST to upload a file to the server. From bf2120fb31390151ad10229d542042483eeb99e5 Mon Sep 17 00:00:00 2001 From: snipe Date: Sun, 10 Aug 2025 18:26:41 +0100 Subject: [PATCH 2/2] Use newer file path --- app/Http/Controllers/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index fc300a5e2b55..266769ffb2a9 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -63,7 +63,7 @@ abstract class Controller extends BaseController 'hardware' => 'private_uploads/assets/', 'licenses' => 'private_uploads/licenses/', 'locations' => 'private_uploads/locations/', - 'models' => 'private_uploads/assetmodels/', + 'models' => 'private_uploads/models/', 'users' => 'private_uploads/users/', ];