mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Scaffold updating template name
This commit is contained in:
parent
37d792352d
commit
8873137ed0
|
@ -55,6 +55,9 @@ class ReportTemplatesController extends Controller
|
||||||
{
|
{
|
||||||
$this->authorize('reports.view');
|
$this->authorize('reports.view');
|
||||||
|
|
||||||
|
// @todo: validation
|
||||||
|
|
||||||
|
$reportTemplate->name = $request->input('name');
|
||||||
$reportTemplate->options = $request->except(['_token', 'name']);
|
$reportTemplate->options = $request->except(['_token', 'name']);
|
||||||
$reportTemplate->save();
|
$reportTemplate->save();
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,6 @@ return [
|
||||||
'open_saved_template' => 'Open Saved Template',
|
'open_saved_template' => 'Open Saved Template',
|
||||||
'save_template' => 'Save Template',
|
'save_template' => 'Save Template',
|
||||||
'select_a_template' => 'Select a Template',
|
'select_a_template' => 'Select a Template',
|
||||||
'template_name' => 'Enter Template Name',
|
'template_name' => 'Template Name',
|
||||||
'update_template' => 'Update Template',
|
'update_template' => 'Update Template',
|
||||||
];
|
];
|
||||||
|
|
|
@ -47,14 +47,29 @@
|
||||||
<div class="box box-default">
|
<div class="box box-default">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h2 class="box-title">
|
<h2 class="box-title">
|
||||||
@if (request()->routeIs('report-templates.edit'))
|
@if (request()->routeIs('report-templates.show'))
|
||||||
{{ trans('general.updating_item', ['item' => $template->name]) }}
|
|
||||||
@elseif(request()->routeIs('report-templates.show'))
|
|
||||||
{{ $template->name }}
|
{{ $template->name }}
|
||||||
@else
|
@elseif (request()->routeIs('reports/custom'))
|
||||||
{{ trans('general.customize_report') }}
|
{{ trans('general.customize_report') }}
|
||||||
@endif
|
@endif
|
||||||
</h2>
|
</h2>
|
||||||
|
@if (request()->routeIs('report-templates.edit'))
|
||||||
|
<div class="pull-right">
|
||||||
|
<div class="form-inline {{ $errors->has('name') ? ' has-error' : '' }}">
|
||||||
|
<label for="name">{{ trans('admin/reports/general.template_name') }}</label>
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
placeholder=""
|
||||||
|
name="name"
|
||||||
|
type="text"
|
||||||
|
id="name"
|
||||||
|
value="{{ $template->name }}"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
{!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
@if (request()->routeIs('report-templates.show'))
|
@if (request()->routeIs('report-templates.show'))
|
||||||
<div class="box-tools pull-right">
|
<div class="box-tools pull-right">
|
||||||
<a
|
<a
|
||||||
|
|
|
@ -30,6 +30,7 @@ class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequi
|
||||||
$user = User::factory()->canViewReports()->create();
|
$user = User::factory()->canViewReports()->create();
|
||||||
|
|
||||||
$reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create([
|
$reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create([
|
||||||
|
'name' => 'Original Name',
|
||||||
'options' => [
|
'options' => [
|
||||||
'id' => 1,
|
'id' => 1,
|
||||||
'category' => 1,
|
'category' => 1,
|
||||||
|
@ -41,12 +42,14 @@ class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequi
|
||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->post($this->getRoute($reportTemplate), [
|
->post($this->getRoute($reportTemplate), [
|
||||||
|
'name' => 'Updated Name',
|
||||||
'id' => 1,
|
'id' => 1,
|
||||||
'company' => 1,
|
'company' => 1,
|
||||||
'by_company_id' => [3],
|
'by_company_id' => [3],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$reportTemplate->refresh();
|
$reportTemplate->refresh();
|
||||||
|
$this->assertEquals('Updated Name', $reportTemplate->name);
|
||||||
$this->assertEquals(1, $reportTemplate->checkmarkValue('id'));
|
$this->assertEquals(1, $reportTemplate->checkmarkValue('id'));
|
||||||
$this->assertEquals(0, $reportTemplate->checkmarkValue('category'));
|
$this->assertEquals(0, $reportTemplate->checkmarkValue('category'));
|
||||||
$this->assertEquals([], $reportTemplate->selectValues('by_category_id'));
|
$this->assertEquals([], $reportTemplate->selectValues('by_category_id'));
|
||||||
|
|
Loading…
Reference in a new issue