ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-08-29 10:17:26 +01:00
parent 560bd6da92 b3c583b6dc
commit 7dd493da35
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportsController.php
+2 -2
View File
@@ -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')) {
resources/views/hardware/bulk-delete.blade.php
+3 -3
View File
@@ -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>