diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 6883e8cea3..89a0a07a21 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -830,7 +830,7 @@ class ReportsController extends Controller } 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 @@ class ReportsController extends Controller } 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')) { diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index 0db67bd9eb..85185bdc09 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -43,14 +43,14 @@ {{ $asset->display_name }} @if ($asset->location) - {{ $asset->location->present()->name() }} + {{ $asset->location->display_name }} @elseif($asset->rtd_location) - {{ $asset->defaultLoc->present()->name() }} + {{ $asset->defaultLoc->display_name }} @endif @if ($asset->assigned) - {{ $asset->assigned->present()->name() }} + {{ $asset->assigned->display_name }} @endif