A free open source IT asset/license management system
Allow using same template name
Marcus Moore71c9b927c6ed
diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.phpindex d74ed938c4..338f463808 100644--- a/app/Http/Controllers/ReportTemplatesController.php+++ b/app/Http/Controllers/ReportTemplatesController.php@@ -68,10 +68,8 @@ class ReportTemplatesController extends Controller->withError(trans('general.report_not_editable'));}- $validated = $request->validate(Arr::except($reportTemplate->getRules(), 'options'));-$properties = [- 'name' => $validated['name'],+ 'name' => $request->input('name'),'options' => Arr::except($request->all(), ['_token', 'id', 'name', 'share_report_template']),'share_report_template' => $reportTemplate->share_report_template,];@@ -80,7 +78,13 @@ class ReportTemplatesController extends Controller$properties['share_report_template'] = $request->boolean('share_report_template');}- $reportTemplate->update($properties);+ $reportTemplate->fill($properties);++ if ($reportTemplate->isInvalid()) {+ return redirect()->back()->withInput()->withErrors($reportTemplate->getErrors());+ }++ $reportTemplate->save();session()->flash('success', trans('admin/reports/message.update.success'));diff --git a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.phpindex 862cce5856..aab7e27e5b 100644--- a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php+++ b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php@@ -93,6 +93,29 @@ class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequi$this->assertEquals([3], $reportTemplate->selectValues('by_company_id'));}+ public function testCanUpdateAReportTemplateWithTheSameName()+ {+ $user = User::factory()->canViewReports()->create();++ $reportTemplate = ReportTemplate::factory()->notShared()->for($user, 'creator')->create([+ 'name' => 'Original Name',+ 'options' => [+ 'category' => 1,+ 'by_category_id' => 2,+ 'company' => 1,+ 'by_company_id' => [1, 2],+ ],+ ]);++ $this->actingAs($user)+ ->post(route('report-templates.update', $reportTemplate), [+ 'name' => 'Original Name',+ 'company' => 1,+ 'by_company_id' => [3],+ ])+ ->assertSessionDoesntHaveErrors();+ }+public function testCanShareAReportTemplate(){$user = User::factory()->canViewReports()->create();