A free open source IT asset/license management system
Simplify assignments
Marcus Moore1992d03f2284
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.phpindex c77f1f4619..8090e4093c 100644--- a/app/Http/Controllers/Reports/CustomComponentReportController.php+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php@@ -106,21 +106,10 @@ class CustomComponentReportController extends Controllerif ($request->filled('include_assignments')) {if (isset($component->assets[$i])) {- if ($request->filled('asset_name')) {- $row[] = $component->assets[$i]->name ?? '';- }-- if ($request->filled('asset_tag')) {- $row[] = $component->assets[$i]->asset_tag ?? '';- }-- if ($request->filled('asset_company')) {- $row[] = $component->assets[$i]->company->name ?? '';- }-- if ($request->filled('asset_serial')) {- $row[] = $component->assets[$i]->serial;- }+ $row[] = $component->assets[$i]->name ?? '';+ $row[] = $component->assets[$i]->asset_tag ?? '';+ $row[] = $component->assets[$i]->company->name ?? '';+ $row[] = $component->assets[$i]->serial;} else {$row[] = '';$row[] = '';@@ -250,21 +239,10 @@ class CustomComponentReportController extends Controller}if ($request->filled('include_assignments')) {- if ($request->filled('asset_name')) {- $header[] = trans('admin/hardware/form.name');- }-- if ($request->filled('asset_tag')) {- $header[] = trans('admin/hardware/form.tag');- }-- if ($request->filled('asset_company')) {- $header[] = trans('admin/reports/general.custom_export.asset_company');- }-- if ($request->filled('asset_serial')) {- $header[] = trans('admin/reports/general.custom_export.asset_serial');- }+ $header[] = trans('admin/hardware/form.name');+ $header[] = trans('admin/hardware/form.tag');+ $header[] = trans('admin/reports/general.custom_export.asset_company');+ $header[] = trans('admin/reports/general.custom_export.asset_serial');}if ($request->filled('purchase_date')) {diff --git a/resources/views/reports/custom/component.blade.php b/resources/views/reports/custom/component.blade.phpindex 1da26a962b..a2704816a6 100644--- a/resources/views/reports/custom/component.blade.php+++ b/resources/views/reports/custom/component.blade.php@@ -196,27 +196,12 @@{{ trans('general.notes') }}</label>- <h2>{{ trans('general.checked_out_to_fields') }}: </h2>-- <label class="form-control">- <input type="checkbox" name="asset_name" value="1" @checked($template->checkmarkValue('asset_name')) />- {{ trans('admin/hardware/form.name') }}- </label>-+ <h2>{{ trans('general.assigned') }}: </h2><label class="form-control">- <input type="checkbox" name="asset_tag" value="1" @checked($template->checkmarkValue('asset_tag')) />- {{ trans('admin/hardware/form.tag') }}- </label>-- <label class="form-control">- <input type="checkbox" name="asset_company" value="1" @checked($template->checkmarkValue('asset_company')) />- {{ trans('admin/reports/general.custom_export.asset_company') }}- </label>-- <label class="form-control">- <input type="checkbox" name="asset_serial" value="1" @checked($template->checkmarkValue('asset_serial')) />- {{ trans('admin/reports/general.custom_export.asset_serial') }}+ <input type="checkbox" name="include_assignments" value="1" @checked($template->checkmarkValue('include_assignments', '0')) />+ Include Assignments</label>+ <p class="help-block">todo: details</p></div> <!-- /.col-md-4-->@@ -436,14 +421,6 @@</label></div>- <div class="col-md-9 col-md-offset-3">- <label class="form-control">- <input type="checkbox" name="include_assignments" value="1" @checked($template->checkmarkValue('include_assignments', '0')) />- Include Assignments- </label>- <p class="help-block">todo: details</p>- </div>-<div class="col-md-9 col-md-offset-3"><label class="form-control"><inputdiff --git a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php b/tests/Feature/Reporting/Custom/CustomComponentReportTest.phpindex d6a534af5f..6e6853afbc 100644--- a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php+++ b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php@@ -120,10 +120,6 @@ class CustomComponentReportTest extends TestCase'updated_at' => '1','deleted_at' => '1','notes' => '1',- 'asset_name' => '1',- 'asset_tag' => '1',- 'asset_company' => '1',- 'asset_serial' => '1',])->assertOk()->assertCsvHeader()@@ -639,10 +635,6 @@ class CustomComponentReportTest extends TestCase$this->sendRequest(['component_name' => '1','include_assignments' => '1',- 'asset_name' => '1',- 'asset_tag' => '1',- 'asset_company' => '1',- 'asset_serial' => '1',])->assertOk()->assertCsvHeader()