Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/ReportsController.php

@@ -830,7 +830,7 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
                     }
 
                     if ($request->filled('location')) {
-                        $row[] = ($asset->location) ? $asset->location->present()->name() : '';
+                        $row[] = ($asset->location) ? $asset->location->display_name : '';
                     }
 
                     if ($request->filled('location_address')) {
@@ -843,7 +843,7 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
                     }
 
                     if ($request->filled('rtd_location')) {
-                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->present()->name() : '';
+                        $row[] = ($asset->defaultLoc) ? $asset->defaultLoc->display_name : '';
                     }
 
                     if ($request->filled('rtd_location_address')) {

resources/views/hardware/bulk-delete.blade.php

@@ -43,14 +43,14 @@
                 <td>{{ $asset->display_name }}</td>
                 <td>
                   @if ($asset->location)
-                  {{ $asset->location->present()->name() }}
+                  {{ $asset->location->display_name }}
                   @elseif($asset->rtd_location)
-                  {{ $asset->defaultLoc->present()->name() }}
+                  {{ $asset->defaultLoc->display_name }}
                   @endif
                 </td>
                 <td>
                   @if ($asset->assigned)
-                    {{ $asset->assigned->present()->name() }}
+                    {{ $asset->assigned->display_name }}
                   @endif
                 </td>
               </tr>