DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets

Browse source 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
This commit is contained in:
snipe 2022-12-15 14:19:41 -08:00 committed by GitHub
parent d0c5ba70f6 eb67d1b064
commit 399c7590cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1110,6 +1110,9 @@ class ReportsController extends Controller
$rows[] = implode(',', $header); $rows[] = implode(',', $header);
foreach ($assetsForReport as $item) { foreach ($assetsForReport as $item) {
if ($item['assetItem'] != null){
$row = [ ]; $row = [ ];
$row[] = str_replace(',', '', e($item['assetItem']->model->category->name)); $row[] = str_replace(',', '', e($item['assetItem']->model->category->name));
$row[] = str_replace(',', '', e($item['assetItem']->model->name)); $row[] = str_replace(',', '', e($item['assetItem']->model->name));
@ -1117,6 +1120,9 @@ class ReportsController extends Controller
$row[] = str_replace(',', '', e($item['assetItem']->asset_tag)); $row[] = str_replace(',', '', e($item['assetItem']->asset_tag));
$row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user'))); $row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
$rows[] = implode(',', $row); $rows[] = implode(',', $row);
} else {
// Log the error maybe?
}
} }
// spit out a csv // spit out a csv