From 1a7bac77b913dbeba066a8099e9120b50f813a2c Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 9 Feb 2018 09:00:13 +0800 Subject: [PATCH] Add proper form field label on view-forms stub --- src/stubs/view-forms.stub | 10 ++++++---- tests/Generators/ViewsGeneratorTest.php | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/stubs/view-forms.stub b/src/stubs/view-forms.stub index 9fe2ea7..f0f1eff 100644 --- a/src/stubs/view-forms.stub +++ b/src/stubs/view-forms.stub @@ -1,15 +1,15 @@ @if (Request::get('action') == 'create') {!! Form::open(['route' => 'masters.store']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::textarea('description') !!} + {!! FormField::text('name', ['required' => true, 'label' => trans('master.name')]) !!} + {!! FormField::textarea('description', ['label' => trans('master.description')]) !!} {!! Form::submit(trans('master.create'), ['class' => 'btn btn-success']) !!} {{ link_to_route('masters.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} {!! Form::close() !!} @endif @if (Request::get('action') == 'edit' && $editableMaster) {!! Form::model($editableMaster, ['route' => ['masters.update', $editableMaster->id],'method' => 'patch']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::textarea('description') !!} + {!! FormField::text('name', ['required' => true, 'label' => trans('master.name')]) !!} + {!! FormField::textarea('description', ['label' => trans('master.description')]) !!} @if (request('q')) {{ Form::hidden('q', request('q')) }} @endif @@ -26,6 +26,8 @@

{{ $editableMaster->name }}

+ +

{{ $editableMaster->description }}

{!! $errors->first('master_id', ':message') !!}

diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php index a972d48..6fd5609 100644 --- a/tests/Generators/ViewsGeneratorTest.php +++ b/tests/Generators/ViewsGeneratorTest.php @@ -92,16 +92,16 @@ class ViewsGeneratorTest extends TestCase $this->assertFileExists($formViewPath); $formViewContent = "@if (Request::get('action') == 'create') {!! Form::open(['route' => '{$this->table_name}.store']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::textarea('description') !!} + {!! FormField::text('name', ['required' => true, 'label' => trans('{$this->lang_name}.name')]) !!} + {!! FormField::textarea('description', ['label' => trans('{$this->lang_name}.description')]) !!} {!! Form::submit(trans('{$this->lang_name}.create'), ['class' => 'btn btn-success']) !!} {{ link_to_route('{$this->table_name}.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} {!! Form::close() !!} @endif @if (Request::get('action') == 'edit' && \$editable{$this->model_name}) {!! Form::model(\$editable{$this->model_name}, ['route' => ['{$this->table_name}.update', \$editable{$this->model_name}->id],'method' => 'patch']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::textarea('description') !!} + {!! FormField::text('name', ['required' => true, 'label' => trans('{$this->lang_name}.name')]) !!} + {!! FormField::textarea('description', ['label' => trans('{$this->lang_name}.description')]) !!} @if (request('q')) {{ Form::hidden('q', request('q')) }} @endif @@ -118,6 +118,8 @@ class ViewsGeneratorTest extends TestCase

{{ \$editable{$this->model_name}->name }}

+ +

{{ \$editable{$this->model_name}->description }}

{!! \$errors->first('{$this->lang_name}_id', ':message') !!}