DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Formatting and clean ups

Browse source
This commit is contained in:
Marcus Moore 2023-12-20 16:24:48 -08:00
parent 0504c09a9a
commit 9a5c8c4ce6
No known key found for this signature in database
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Http/Controllers/ReportTemplatesController.php
View file

@ -18,18 +18,11 @@ class ReportTemplatesController extends Controller
'name' => $request->get('name'), 'name' => $request->get('name'),
'options' => $request->except(['_token', 'name']), 'options' => $request->except(['_token', 'name']),
]); ]);
// This is for error handling in creation. This probably is the wrong spot, and syntax is off, but i don't wanna forget
// if(is_null($report->name)) {
// return redirect()->route('reports/custom')->with('error', trans('reports/message.create.needs_title'));
// }
// elseif(exists($report->name)) {
// return redirect()->route('reports/custom')->with('error', trans('reports/message.create.duplicate'));
// }
return redirect()->route('report-templates.show', $report->id); return redirect()->route('report-templates.show', $report->id);
} }
public function show(Request $request, $reportId) public function show($reportId)
{ {
$this->authorize('reports.view'); $this->authorize('reports.view');
@ -50,13 +43,11 @@ class ReportTemplatesController extends Controller
]); ]);
} }
public function edit(Request $request, $reportId) public function edit($reportId)
{ {
$report = ReportTemplate::findOrFail($reportId);
return view('reports/custom', [ return view('reports/custom', [
'customfields' => CustomField::get(), 'customfields' => CustomField::get(),
'reportTemplate' => $report, 'reportTemplate' => ReportTemplate::findOrFail($reportId),
]); ]);
} }
@ -67,8 +58,8 @@ class ReportTemplatesController extends Controller
$reportTemplate = ReportTemplate::find($reportId); $reportTemplate = ReportTemplate::find($reportId);
if (!$reportTemplate) { if (!$reportTemplate) {
// @todo: what is the behavior we want? return redirect()->route('reports/custom')
return redirect()->route('reports/custom'); ->with('error', 'Template does not exist or you do not have permission to view it.');
} }
$reportTemplate->options = $request->except(['_token', 'name']); $reportTemplate->options = $request->except(['_token', 'name']);
@ -84,7 +75,6 @@ class ReportTemplatesController extends Controller
$reportTemplate = ReportTemplate::find($reportId); $reportTemplate = ReportTemplate::find($reportId);
if (!$reportTemplate) { if (!$reportTemplate) {
// @todo: what is the behavior we want?
return redirect()->route('reports/custom') return redirect()->route('reports/custom')
->with('error', 'Template does not exist or you do not have permission to delete it.'); ->with('error', 'Template does not exist or you do not have permission to delete it.');
} }

3
resources/views/reports/custom.blade.php
View file

@ -497,8 +497,6 @@
e.preventDefault(e); e.preventDefault(e);
let form = $('#custom-report-form'); let form = $('#custom-report-form');
{{-- handle null? --}}
{{-- handle duplicate name? --}}
$('<input>').attr({ $('<input>').attr({
type: 'hidden', type: 'hidden',
name: 'name', name: 'name',
@ -514,6 +512,5 @@
$(this).find(".modal-body").text(content); $(this).find(".modal-body").text(content);
$(this).find(".modal-header").text(title); $(this).find(".modal-header").text(title);
}); });
</script> </script>
@stop @stop