DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-06 10:42:48 -08:00
parent def69b1aaa 936ff707c7
commit a11d9b84a4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -582,10 +582,15 @@ class ReportsController extends Controller
if (e(Input::get('username')) == '1') { if (e(Input::get('username')) == '1') {
// 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()) {
if ($asset->assignedto) {
$row[] = '"' .e($asset->assignedto->username). '"'; $row[] = '"' .e($asset->assignedto->username). '"';
} else { } else {
$row[] = ''; // Empty string if unassigned $row[] = ''; // Empty string if unassigned
} }
} else {
$row[] = ''; // Empty string if unassigned
}
} }
if (e(Input::get('employee_num')) == '1') { if (e(Input::get('employee_num')) == '1') {