Skip to content

A free open source IT asset/license management system

adds display name as an option for labels

Godfrey M92b6e4624970
diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.php
index a0d4f9eecd..8722f7930c 100644
--- a/app/Models/Labels/FieldOption.php
+++ b/app/Models/Labels/FieldOption.php
@@ -31,6 +31,14 @@ class FieldOption
if ($asset->relationLoaded('assignedTo')) {
// If the "assignedTo" relationship was eager loaded then the way to get the
// relationship changes from $asset->assignedTo to $asset->assigned.
+ return $asset->assigned ? $asset->assigned->full_name : null;
+ }
+
+ return $asset->assignedTo ? $asset->assignedTo->full_name : null;
+ }
+ if ($dataPath[0] === 'displayName') {
+ if ($asset->relationLoaded('assignedTo')) {
+
return $asset->assigned ? $asset->assigned->display_name : null;
}
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index b64fbf8b5e..a74543a418 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -323,6 +323,7 @@
<option value="order_number">{{trans('admin/hardware/form.order')}}</option>
<option value="purchase_date">{{trans('admin/hardware/table.purchase_date')}}</option>
<option value="assignedTo">{{trans('admin/hardware/table.assigned_to')}}</option>
+ <option value="displayName">{{trans('admin/users/table.display_name')}}</option>
<option value="last_audit_date">{{trans('general.last_audit')}}</option>
<option value="next_audit_date">{{trans('general.next_audit_date')}}</option>
</optgroup>