DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-12-07 16:23:50 -08:00
parent 97731cd7c8 f7da87520c
commit 743264fd0e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ReportsController.php
View file

@ -763,7 +763,7 @@ class ReportsController extends Controller
if ($request->filled('username')) { if ($request->filled('username')) {
// Only works if we're checked out to a user, not anything else. // Only works if we're checked out to a user, not anything else.
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->username : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->username : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -772,7 +772,7 @@ class ReportsController extends Controller
if ($request->filled('employee_num')) { if ($request->filled('employee_num')) {
// Only works if we're checked out to a user, not anything else. // Only works if we're checked out to a user, not anything else.
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->employee_num : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->employee_num : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -780,7 +780,7 @@ class ReportsController extends Controller
if ($request->filled('manager')) { if ($request->filled('manager')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = (($asset->assignedTo) && ($asset->assignedTo->manager)) ? $asset->assignedTo->manager->present()->fullName : ''; $row[] = (($asset->assignedto) && ($asset->assignedto->manager)) ? $asset->assignedto->manager->present()->fullName : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -788,7 +788,7 @@ class ReportsController extends Controller
if ($request->filled('department')) { if ($request->filled('department')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = (($asset->assignedTo) && ($asset->assignedTo->department)) ? $asset->assignedTo->department->name : ''; $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
@ -796,7 +796,7 @@ class ReportsController extends Controller
if ($request->filled('title')) { if ($request->filled('title')) {
if ($asset->checkedOutToUser()) { if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedTo) ? $asset->assignedTo->jobtitle : ''; $row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : '';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }

2
resources/views/hardware/view.blade.php
View file

@ -586,7 +586,7 @@
@if (($asset->serial && $asset->model->manufacturer) && $asset->model->manufacturer->name == 'Apple') @if (($asset->serial && $asset->model->manufacturer) && $asset->model->manufacturer->name == 'Apple')
<a href="https://checkcoverage.apple.com/us/{{ \App\Models\Setting::getSettings()->locale }}/?sn={{ $asset->serial }}" target="_blank"> <a href="https://checkcoverage.apple.com/us/{{ \App\Models\Setting::getSettings()->locale }}/?sn={{ $asset->serial }}" target="_blank">
<i class="fa-brands fa-apple" aria-hidden="true"><span class="sr-only">Applecare Statys Lookup</span></i> <i class="fa-brands fa-apple" aria-hidden="true"><span class="sr-only">Applecare Status Lookup</span></i>
</a> </a>
@endif @endif
</div> </div>