From d31e7ed534edfa97d63bafbeaf053c244ff94764 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 7 Aug 2025 18:24:02 +0100 Subject: [PATCH] Use new route Signed-off-by: snipe --- app/Models/Actionlog.php | 35 ++++++-------------- resources/views/modals/upload-file.blade.php | 2 +- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index 2f2a8cfcee..6399eab833 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -7,6 +7,7 @@ use App\Presenters\Presentable; use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Str; /** * Model for the Actionlog (the table that keeps a historical log of @@ -462,26 +463,17 @@ class Actionlog extends SnipeModel return route('log.storedeula.download', ['filename' => $this->filename]); } - switch ($this->item_type) { - case Accessory::class: - return route('show.accessoryfile', [$this->item_id, $this->id]); - case Asset::class: - return route('show/assetfile', [$this->item_id, $this->id]); - case AssetModel::class: - return route('show/modelfile', [$this->item_id, $this->id]); - case Consumable::class: - return route('show.consumablefile', [$this->item_id, $this->id]); - case Component::class: - return route('show.componentfile', [$this->item_id, $this->id]); - case License::class: - return route('show.licensefile', [$this->item_id, $this->id]); - case Location::class: - return route('show/locationsfile', [$this->item_id, $this->id]); - case User::class: - return route('show/userfile', [$this->item_id, $this->id]); - default: - return null; + $object = Str::snake(str_plural(str_replace("App\Models\\", '', $this->item_type))); + + if ($object == 'asset_models') { + $object = 'models'; } + return route('ui.files.show', [ + 'object_type' => $object, + 'id' => $this->item_id, + 'file_id' => $this->id, + ]); + } public function uploads_file_path() @@ -514,11 +506,6 @@ class Actionlog extends SnipeModel } - - - - - // Manually sets $this->source for determineActionSource() public function setActionSource($source = null): void { diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php index a4738286d1..239031f207 100644 --- a/resources/views/modals/upload-file.blade.php +++ b/resources/views/modals/upload-file.blade.php @@ -8,7 +8,7 @@