DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Hotfixes adding company name to custom report

Browse source
This commit is contained in:
snipe 2016-09-20 00:49:08 -07:00
parent 04898c49b2
commit d3d36315d3
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -396,6 +396,9 @@ class ReportsController extends Controller
$rows = [ ]; $rows = [ ];
$header = [ ]; $header = [ ];
if (e(Input::get('company_name')) == '1') {
$header[] = 'Company Name';
}
if (e(Input::get('asset_name')) == '1') { if (e(Input::get('asset_name')) == '1') {
$header[] = 'Asset Name'; $header[] = 'Asset Name';
} }
@ -461,6 +464,10 @@ class ReportsController extends Controller
foreach ($assets as $asset) { foreach ($assets as $asset) {
$row = [ ]; $row = [ ];
if (e(Input::get('company_name')) == '1') {
$row[] = is_null($asset->company) ? '' : e($asset->company->name);
}
if (e(Input::get('asset_name')) == '1') { if (e(Input::get('asset_name')) == '1') {
$row[] = '"' .e($asset->name) . '"'; $row[] = '"' .e($asset->name) . '"';
} }