odon
/
SimpleCrudGenerator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update simple form view to correct delete action

tags/1.2.0
Nafies Luthfi 7 years ago
parent
06cb3a5a03
commit
0ef54c273c
2 changed files with 34 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/stubs/resources/views/simple/forms.stub
  2. 12
      tests/Generators/Simple/ViewsGeneratorTest.php

12
src/stubs/resources/views/simple/forms.stub
View File

@ -21,7 +21,6 @@
@can('update', $editableMaster) @can('update', $editableMaster)
<form method="POST" action="{{ route('masters.update', $editableMaster) }}" accept-charset="UTF-8"> <form method="POST" action="{{ route('masters.update', $editableMaster) }}" accept-charset="UTF-8">
{{ csrf_field() }} {{ method_field('patch') }} {{ csrf_field() }} {{ method_field('patch') }}
<div class="panel-body">
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="control-label">{{ __('master.name') }}</label> <label for="name" class="control-label">{{ __('master.name') }}</label>
<input id="name" type="text" class="form-control" name="name" value="{{ old('name', $editableMaster->name) }}" required> <input id="name" type="text" class="form-control" name="name" value="{{ old('name', $editableMaster->name) }}" required>
@ -32,14 +31,13 @@
<textarea id="description" type="text" class="form-control" name="description" rows="4">{{ old('description', $editableMaster->description) }}</textarea> <textarea id="description" type="text" class="form-control" name="description" rows="4">{{ old('description', $editableMaster->description) }}</textarea>
{!! $errors->first('description', '<span class="help-block small">:message</span>') !!} {!! $errors->first('description', '<span class="help-block small">:message</span>') !!}
</div> </div>
</div>
<div class="panel-footer">
<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"> <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.show', $editableMaster) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
@can('delete', $editableMaster) @can('delete', $editableMaster)
<a href="{{ route('masters.edit', [$editableMaster, 'action' => 'delete']) }}" id="del-master-{{ $editableMaster->id }}" class="btn btn-danger pull-right">{{ __('app.delete') }}</a>
<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 @endcan
</div>
</form> </form>
@endcan @endcan
@endif @endif
@ -60,8 +58,8 @@
<form method="POST" action="{{ route('masters.destroy', $editableMaster) }}" accept-charset="UTF-8" onsubmit="return confirm(&quot;Are you sure to delete this?&quot;)" class="del-form pull-right" style="display: inline;"> <form method="POST" action="{{ route('masters.destroy', $editableMaster) }}" accept-charset="UTF-8" onsubmit="return confirm(&quot;Are you sure to delete this?&quot;)" class="del-form pull-right" style="display: inline;">
{{ csrf_field() }} {{ method_field('delete') }} {{ csrf_field() }} {{ method_field('delete') }}
<input name="master_id" type="hidden" value="{{ $editableMaster->id }}"> <input name="master_id" type="hidden" value="{{ $editableMaster->id }}">
<input name="{{ request('page') }}" type="hidden">
<input name="{{ request('q') }}" type="hidden">
<input name="page" value="{{ request('page') }}" type="hidden">
<input name="q" value="{{ request('q') }}" type="hidden">
<button title="Delete this item" type="submit" class="btn btn-danger">{{ __('app.delete_confirm_button') }}</button> <button title="Delete this item" type="submit" class="btn btn-danger">{{ __('app.delete_confirm_button') }}</button>
</form> </form>
<a href="{{ route('masters.index', [$editableMaster] + Request::only('page', 'q')) }}" class="btn btn-default">{{ __('app.cancel') }}</a> <a href="{{ route('masters.index', [$editableMaster] + Request::only('page', 'q')) }}" class="btn btn-default">{{ __('app.cancel') }}</a>

12
tests/Generators/Simple/ViewsGeneratorTest.php
View File

@ -109,7 +109,6 @@ class ViewsGeneratorTest extends TestCase
@can('update', \$editable{$this->model_name}) @can('update', \$editable{$this->model_name})
<form method=\"POST\" action=\"{{ route('{$this->table_name}.update', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\"> <form method=\"POST\" action=\"{{ route('{$this->table_name}.update', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\">
{{ csrf_field() }} {{ method_field('patch') }} {{ csrf_field() }} {{ method_field('patch') }}
<div class=\"panel-body\">
<div class=\"form-group{{ \$errors->has('name') ? ' has-error' : '' }}\"> <div class=\"form-group{{ \$errors->has('name') ? ' has-error' : '' }}\">
<label for=\"name\" class=\"control-label\">{{ __('{$this->lang_name}.name') }}</label> <label for=\"name\" class=\"control-label\">{{ __('{$this->lang_name}.name') }}</label>
<input id=\"name\" type=\"text\" class=\"form-control\" name=\"name\" value=\"{{ old('name', \$editable{$this->model_name}->name) }}\" required> <input id=\"name\" type=\"text\" class=\"form-control\" name=\"name\" value=\"{{ old('name', \$editable{$this->model_name}->name) }}\" required>
@ -120,14 +119,13 @@ class ViewsGeneratorTest extends TestCase
<textarea id=\"description\" type=\"text\" class=\"form-control\" name=\"description\" rows=\"4\">{{ old('description', \$editable{$this->model_name}->description) }}</textarea> <textarea id=\"description\" type=\"text\" class=\"form-control\" name=\"description\" rows=\"4\">{{ old('description', \$editable{$this->model_name}->description) }}</textarea>
{!! \$errors->first('description', '<span class=\"help-block small\">:message</span>') !!} {!! \$errors->first('description', '<span class=\"help-block small\">:message</span>') !!}
</div> </div>
</div>
<div class=\"panel-footer\">
<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\"> <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}.show', \$editable{$this->model_name}) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
@can('delete', \$editable{$this->model_name}) @can('delete', \$editable{$this->model_name})
<a href=\"{{ route('{$this->table_name}.edit', [\$editable{$this->model_name}, 'action' => 'delete']) }}\" id=\"del-{$this->lang_name}-{{ \$editable{$this->model_name}->id }}\" class=\"btn btn-danger pull-right\">{{ __('app.delete') }}</a>
<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 @endcan
</div>
</form> </form>
@endcan @endcan
@endif @endif
@ -148,8 +146,8 @@ class ViewsGeneratorTest extends TestCase
<form method=\"POST\" action=\"{{ route('{$this->table_name}.destroy', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\" onsubmit=\"return confirm(&quot;Are you sure to delete this?&quot;)\" class=\"del-form pull-right\" style=\"display: inline;\"> <form method=\"POST\" action=\"{{ route('{$this->table_name}.destroy', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\" onsubmit=\"return confirm(&quot;Are you sure to delete this?&quot;)\" class=\"del-form pull-right\" style=\"display: inline;\">
{{ csrf_field() }} {{ method_field('delete') }} {{ csrf_field() }} {{ method_field('delete') }}
<input name=\"{$this->lang_name}_id\" type=\"hidden\" value=\"{{ \$editable{$this->model_name}->id }}\"> <input name=\"{$this->lang_name}_id\" type=\"hidden\" value=\"{{ \$editable{$this->model_name}->id }}\">
<input name=\"{{ request('page') }}\" type=\"hidden\">
<input name=\"{{ request('q') }}\" type=\"hidden\">
<input name=\"page\" value=\"{{ request('page') }}\" type=\"hidden\">
<input name=\"q\" value=\"{{ request('q') }}\" type=\"hidden\">
<button title=\"Delete this item\" type=\"submit\" class=\"btn btn-danger\">{{ __('app.delete_confirm_button') }}</button> <button title=\"Delete this item\" type=\"submit\" class=\"btn btn-danger\">{{ __('app.delete_confirm_button') }}</button>
</form> </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', [\$editable{$this->model_name}] + Request::only('page', 'q')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>

Write Preview
Loading…
Cancel
Save