A free open source IT asset/license management system
fix display name of item"
Godfrey M30ac3d1a2673
diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.phpindex 29e0cc5c57..0123256e90 100644--- a/resources/lang/en-US/mail.php+++ b/resources/lang/en-US/mail.php@@ -48,7 +48,7 @@ return ['asset_tag' => 'Asset Tag','assets_warrantee_alert' => 'There is :count asset with an expiring warranty or that are reaching their end of life in the next :threshold days.|There are :count assets with expiring warranties or that are reaching their end of life in the next :threshold days.','assigned_to' => 'Assigned To',- 'assigned_to_assets' => 'Assigned to Assets',+ 'assigned_to_assets' => 'Assignments to Assets','eol' => 'EOL','best_regards' => 'Best regards,','canceled' => 'Canceled',diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.phpindex 0801edc5bd..1718602559 100644--- a/resources/views/users/print.blade.php+++ b/resources/views/users/print.blade.php@@ -399,9 +399,9 @@@foreach ($asset->assignedAssets as $indirectAsset)<tr><td>{{ $indirectAssignmentsCounter }}</td>- <td>{{ $indirectAsset->assignedTo->display_name }}</td>+ <td>{{ $indirectAsset->assignedTo?->display_name ?? ''}}</td><td>{{ (($indirectAsset->model) && ($indirectAsset->model->category)) ? $indirectAsset->model->category->name : trans('general.invalid_category') }}</td>- <td>{{ ($indirectAsset->model) ? $indirectAsset->model->name : trans('general.invalid_model') }}</td>+ <td>{{ $indirectAsset->display_name ?? '' }}</td></tr>@php