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

adds check that asset has asset status before checking archived

Browse source
This commit is contained in:
Godfrey M 2025-02-03 12:24:22 -08:00
parent d906f3cf62
commit 24bb679305
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Notifications/CheckinAssetNotification.php
View file

@ -143,7 +143,7 @@ class CheckinAssetNotification extends Notification
KeyValue::create( KeyValue::create(
trans('mail.checked_into') ?: '', trans('mail.checked_into') ?: '',
$item->location->name ? $item->location->name : '', $item->location->name ? $item->location->name : '',
trans('admin/hardware/form.status').": ".$item->assetstatus->name, trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
) )
->onClick(route('hardware.show', $item->id)) ->onClick(route('hardware.show', $item->id))
) )

2
resources/views/locations/print.blade.php
View file

@ -126,7 +126,7 @@
@foreach ($assets as $asset) @foreach ($assets as $asset)
@php @php
if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){ if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
continue; continue;
} }
@endphp @endphp