From 0ab7b8cc2e7a21dd1143c4e4ed2cb5bd215edb50 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Mon, 13 Aug 2018 21:06:50 +0800 Subject: [PATCH] Fix invalid delete button variable on simpe edit form --- src/stubs/resources/views/simple/forms.stub | 6 +++--- tests/Generators/Simple/ViewsGeneratorTest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/stubs/resources/views/simple/forms.stub b/src/stubs/resources/views/simple/forms.stub index 4927214..a98cdc3 100644 --- a/src/stubs/resources/views/simple/forms.stub +++ b/src/stubs/resources/views/simple/forms.stub @@ -21,12 +21,12 @@ @endif {!! Form::submit(__('master.update'), ['class' => 'btn btn-success']) !!} {{ link_to_route('masters.index', __('app.cancel'), Request::only('page', 'q'), ['class' => 'btn btn-default']) }} - @can('delete', $singleMstr) + @can('delete', $editableMaster) {!! link_to_route( 'masters.index', __('app.delete'), - ['action' => 'delete', 'id' => $singleMstr->id] + Request::only('page', 'q'), - ['id' => 'del-master-'.$singleMstr->id, 'class' => 'btn btn-danger pull-right'] + ['action' => 'delete', 'id' => $editableMaster->id] + Request::only('page', 'q'), + ['id' => 'del-master-'.$editableMaster->id, 'class' => 'btn btn-danger pull-right'] ) !!} @endcan {!! Form::close() !!} diff --git a/tests/Generators/Simple/ViewsGeneratorTest.php b/tests/Generators/Simple/ViewsGeneratorTest.php index 4a88221..1fed9e6 100644 --- a/tests/Generators/Simple/ViewsGeneratorTest.php +++ b/tests/Generators/Simple/ViewsGeneratorTest.php @@ -111,12 +111,12 @@ class ViewsGeneratorTest extends TestCase @endif {!! Form::submit(__('{$this->lang_name}.update'), ['class' => 'btn btn-success']) !!} {{ link_to_route('{$this->table_name}.index', __('app.cancel'), Request::only('page', 'q'), ['class' => 'btn btn-default']) }} - @can('delete', \${$this->single_model_var_name}) + @can('delete', \$editable{$this->model_name}) {!! link_to_route( '{$this->table_name}.index', __('app.delete'), - ['action' => 'delete', 'id' => \${$this->single_model_var_name}->id] + Request::only('page', 'q'), - ['id' => 'del-{$this->lang_name}-'.\${$this->single_model_var_name}->id, 'class' => 'btn btn-danger pull-right'] + ['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'] ) !!} @endcan {!! Form::close() !!}