DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix all

Browse source
This commit is contained in:
spencerrlongg 2025-02-24 22:35:47 -06:00
parent 27a7c6fd10
commit d949a9689f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Assets/AssetFilesController.php
View file

@ -71,12 +71,12 @@ class AssetFilesController extends Controller
try { try {
return StorageHelper::showOrDownloadFile($file, $log->filename); return StorageHelper::showOrDownloadFile($file, $log->filename);
} catch (\Exception $e) { } 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 @@ class AssetFilesController extends Controller
return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success')); 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'));
} }
} }

4
app/View/Label.php
View file

@ -140,8 +140,8 @@ class Label implements View
$barcode2DTarget = $asset->serial; $barcode2DTarget = $asset->serial;
break; break;
case 'hardware_id': case 'hardware_id':
default: default:
$barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); $barcode2DTarget = route('hardware.show', $asset);
break; break;
} }
$assetData->put('barcode2d', (object)[ $assetData->put('barcode2d', (object)[

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

@ -10,7 +10,7 @@
@php @php
$checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date'); $checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
@endphp @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 @endforeach
@endcomponent @endcomponent

2
routes/web/hardware.php
View file

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