Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/Labels/FieldOption.php

@@ -31,6 +31,14 @@ public function getValue(Asset $asset)
             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;
             }
 

resources/views/hardware/edit.blade.php

@@ -299,7 +299,7 @@ function user_add(status_id) {
                         $("#assigned_location").hide();
                         $("#selected_status_status").removeClass('text-success');
                         $("#selected_status_status").addClass('text-danger');
-                        $("#selected_status_status").html('<x-icon type="warning" /> {{ (($item->assigned_to!='') && ($item->assigned_type!='') && ($item->deleted_at == '')) ? trans('admin/hardware/form.asset_not_deployable_checkin') : trans('admin/hardware/form.asset_not_deployable')  }} ');
+                        $("#selected_status_status").html('<x-icon type="warning" /> {{ (($item->assigned_to!='') && ($item->assigned_type!='') && ($item->deleted_at == '')) ? trans_choice('admin/hardware/form.asset_not_deployable_checkin', 1) : trans('admin/hardware/form.asset_not_deployable')  }} ');
                     }
                 }
             });

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>