Browse Source

Fix invalid cancel link on edit and delete simpel forms

tags/1.2.2
Nafies Luthfi 7 years ago
parent
commit
b0a008c77f
  1. 4
      src/stubs/resources/views/simple/forms.stub
  2. 4
      tests/Generators/Simple/ViewsGeneratorTest.php

4
src/stubs/resources/views/simple/forms.stub

@ -34,7 +34,7 @@
<input name="page" value="{{ request('page') }}" type="hidden">
<input name="q" value="{{ request('q') }}" type="hidden">
<input type="submit" value="{{ __('master.update') }}" class="btn btn-success">
<a href="{{ route('masters.show', $editableMaster) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
<a href="{{ route('masters.index', Request::only('q', 'page')) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
@can('delete', $editableMaster)
<a href="{{ route('masters.index', ['action' => 'delete', 'id' => $editableMaster->id] + Request::only('page', 'q')) }}" id="del-master-{{ $editableMaster->id }}" class="btn btn-danger pull-right">{{ __('app.delete') }}</a>
@endcan
@ -62,7 +62,7 @@
<input name="q" value="{{ request('q') }}" type="hidden">
<button title="Delete this item" type="submit" class="btn btn-danger">{{ __('app.delete_confirm_button') }}</button>
</form>
<a href="{{ route('masters.index', [$editableMaster] + Request::only('page', 'q')) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
<a href="{{ route('masters.index', Request::only('q', 'page')) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
</div>
</div>
@endcan

4
tests/Generators/Simple/ViewsGeneratorTest.php

@ -122,7 +122,7 @@ class ViewsGeneratorTest extends TestCase
<input name=\"page\" value=\"{{ request('page') }}\" type=\"hidden\">
<input name=\"q\" value=\"{{ request('q') }}\" type=\"hidden\">
<input type=\"submit\" value=\"{{ __('{$this->lang_name}.update') }}\" class=\"btn btn-success\">
<a href=\"{{ route('{$this->table_name}.show', \$editable{$this->model_name}) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
<a href=\"{{ route('{$this->table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
@can('delete', \$editable{$this->model_name})
<a href=\"{{ route('{$this->table_name}.index', ['action' => 'delete', 'id' => \$editable{$this->model_name}->id] + Request::only('page', 'q')) }}\" id=\"del-{$this->lang_name}-{{ \$editable{$this->model_name}->id }}\" class=\"btn btn-danger pull-right\">{{ __('app.delete') }}</a>
@endcan
@ -150,7 +150,7 @@ class ViewsGeneratorTest extends TestCase
<input name=\"q\" value=\"{{ request('q') }}\" type=\"hidden\">
<button title=\"Delete this item\" type=\"submit\" class=\"btn btn-danger\">{{ __('app.delete_confirm_button') }}</button>
</form>
<a href=\"{{ route('{$this->table_name}.index', [\$editable{$this->model_name}] + Request::only('page', 'q')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
<a href=\"{{ route('{$this->table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
</div>
</div>
@endcan

Loading…
Cancel
Save