Merge pull request #16325 from spencerrlongg/bug/sc-28520

Remove remaining hardware references in favor of new RMB

Author: snipe

app/Http/Controllers/Assets/AssetFilesController.php

@@ -71,12 +71,12 @@ public function show(Asset $asset, $fileId = null) : View | RedirectResponse | R
             try {
                  return StorageHelper::showOrDownloadFile($file, $log->filename);
             } catch (\Exception $e) {
-                return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.file_not_found'));
+                return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found'));
             }
 
         }
 
-        return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
 
 
     }
@@ -102,7 +102,7 @@ public function destroy(Asset $asset, $fileId = null) : RedirectResponse
             return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
-        return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
     }
 
 }

app/View/Label.php

@@ -140,8 +140,8 @@ public function render(callable $callback = null)
                                 $barcode2DTarget = $asset->serial; 
                                 break;
                             case 'hardware_id':
-                            default: 
-                                $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); 
+                            default:
+                                $barcode2DTarget = route('hardware.show', $asset);
                                 break;
                             }
                             $assetData->put('barcode2d', (object)[

resources/views/notifications/markdown/report-expected-checkins.blade.php

@@ -10,7 +10,7 @@
 @php
 $checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
 @endphp
-| [{{ $asset->present()->name }}]({{ route('hardware.show', ['asset' => $asset]) }}) | [{{ $asset->assignedTo->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) }})  | {{ $checkin['formatted'] }}
+| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset) }}) | [{{ $asset->assignedTo->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) }})  | {{ $checkin['formatted'] }}
 @endforeach
 @endcomponent
 

routes/web/hardware.php

@@ -126,7 +126,7 @@ function () {
 
         // Redirect old legacy /asset_id/view urls to the resource route version
         Route::get('{assetId}/view', function ($assetId) {
-            return redirect()->route('hardware.show', ['hardware' => $assetId]);
+            return redirect()->route('hardware.show', $assetId);
         });
 
         Route::get('{asset}/qr_code',