Merge pull request #18080 from Godmartinz/add-null-safe-operator-to-manager

snipe · web-flow · commit 324bc4957d6a · 2025-10-22T11:56:59.000+01:00
Fixes admin alerts when a location doesnt have a manager
diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.php
@@ -87,7 +87,7 @@ public function content(): Content
             $name  = $this->target->assignedto?->display_name;
         }
         else if($this->target instanceof Location){
-            $name  = $this->target->manager->name;
+            $name  = $this->target->manager?->name;
         }
 
         // Check if the item has custom fields associated with it

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function content(): Content`
`87`	`87`	`$name = $this->target->assignedto?->display_name;`
`88`	`88`	`}`
`89`	`89`	`else if($this->target instanceof Location){`
`90`		`- $name = $this->target->manager->name;`
	`90`	`+ $name = $this->target->manager?->name;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`// Check if the item has custom fields associated with it`