mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 02:05:28 +00:00
Code Issues Projects Releases Wiki Activity

add null checks to target

Browse Source
This commit is contained in:
Godfrey M
2025-08-07 15:27:50 -07:00
parent e47972731b
commit 5c55c90d68
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Mail/CheckoutAssetMail.php
View File

@ -24,6 +24,7 @@ class CheckoutAssetMail extends Mailable
/**
* Create a new message instance.
* @throws \Exception
*/
public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note, bool $firstTimeSending = true)
{
@ -37,10 +38,10 @@ class CheckoutAssetMail extends Mailable
// Location is a target option, but there are no emails currently associated with locations.
if($this->target instanceof User){
$this->target = $this->target->present()->fullName();
$this->target = $this->target->present()?->fullName();
}
else if($this->target instanceof Asset){
$this->target = $this->target->assignedto->present()->fullName();
$this->target = $this->target->assignedto?->present()?->fullName();
}
$this->last_checkout = '';

4
app/Mail/CheckoutLicenseMail.php
View File

@ -31,10 +31,10 @@ class CheckoutLicenseMail extends Mailable
$this->target = $checkedOutTo;
if($this->target instanceof User){
$this->target = $this->target->present()->fullName();
$this->target = $this->target->present()?->fullName();
}
elseif($this->target instanceof Asset){
$this->target = $this->target->assignedto->present()->fullName();
$this->target = $this->target->assignedto?->present()?->fullName();
}
}