From 0ef54c273c864e734bc287d541e7a70bdb048e0c Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 29 Aug 2018 18:33:55 +0800
Subject: [PATCH] Update simple form view to correct delete action

---
 src/stubs/resources/views/simple/forms.stub    | 36 ++++++++++++--------------
 tests/Generators/Simple/ViewsGeneratorTest.php | 36 ++++++++++++--------------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/stubs/resources/views/simple/forms.stub b/src/stubs/resources/views/simple/forms.stub
index 8cd214a..5a3236d 100644
--- a/src/stubs/resources/views/simple/forms.stub
+++ b/src/stubs/resources/views/simple/forms.stub
@@ -21,25 +21,23 @@
 @can('update', $editableMaster)
     <form method="POST" action="{{ route('masters.update', $editableMaster) }}" accept-charset="UTF-8">
         {{ csrf_field() }} {{ method_field('patch') }}
-        <div class="panel-body">
-            <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
-                <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>
-                {!! $errors->first('name', '<span class="help-block small">:message</span>') !!}
-            </div>
-            <div class="form-group{{ $errors->has('description') ? ' has-error' : '' }}">
-                <label for="description" class="control-label">{{ __('master.description') }}</label>
-                <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>') !!}
-            </div>
+        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+            <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>
+            {!! $errors->first('name', '<span class="help-block small">:message</span>') !!}
         </div>
-        <div class="panel-footer">
-            <input type="submit" value="{{ __('master.update') }}" class="btn btn-success">
-            <a href="{{ route('masters.show', $editableMaster) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
-            @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>
-            @endcan
+        <div class="form-group{{ $errors->has('description') ? ' has-error' : '' }}">
+            <label for="description" class="control-label">{{ __('master.description') }}</label>
+            <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>') !!}
         </div>
+        <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>
+        @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
     </form>
 @endcan
 @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;">
                 {{ csrf_field() }} {{ method_field('delete') }}
                 <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>
             </form>
             <a href="{{ route('masters.index', [$editableMaster] + Request::only('page', 'q')) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
diff --git a/tests/Generators/Simple/ViewsGeneratorTest.php b/tests/Generators/Simple/ViewsGeneratorTest.php
index 8f25729..3472c08 100644
--- a/tests/Generators/Simple/ViewsGeneratorTest.php
+++ b/tests/Generators/Simple/ViewsGeneratorTest.php
@@ -109,25 +109,23 @@ class ViewsGeneratorTest extends TestCase
 @can('update', \$editable{$this->model_name})
     <form method=\"POST\" action=\"{{ route('{$this->table_name}.update', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\">
         {{ csrf_field() }} {{ method_field('patch') }}
-        <div class=\"panel-body\">
-            <div class=\"form-group{{ \$errors->has('name') ? ' has-error' : '' }}\">
-                <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>
-                {!! \$errors->first('name', '<span class=\"help-block small\">:message</span>') !!}
-            </div>
-            <div class=\"form-group{{ \$errors->has('description') ? ' has-error' : '' }}\">
-                <label for=\"description\" class=\"control-label\">{{ __('{$this->lang_name}.description') }}</label>
-                <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>') !!}
-            </div>
+        <div class=\"form-group{{ \$errors->has('name') ? ' has-error' : '' }}\">
+            <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>
+            {!! \$errors->first('name', '<span class=\"help-block small\">:message</span>') !!}
         </div>
-        <div class=\"panel-footer\">
-            <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>
-            @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>
-            @endcan
+        <div class=\"form-group{{ \$errors->has('description') ? ' has-error' : '' }}\">
+            <label for=\"description\" class=\"control-label\">{{ __('{$this->lang_name}.description') }}</label>
+            <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>') !!}
         </div>
+        <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>
+        @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
     </form>
 @endcan
 @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;\">
                 {{ csrf_field() }} {{ method_field('delete') }}
                 <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>
             </form>
             <a href=\"{{ route('{$this->table_name}.index', [\$editable{$this->model_name}] + Request::only('page', 'q')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>