From b9485fefc8ccd85ad80300de726beab1ca71e94f Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 17 Feb 2018 07:17:31 +0800 Subject: [PATCH] Remove editableModel query on full controller stub editableModel query only used on simple version of CRUD --- src/stubs/controller.full.stub | 7 +------ tests/Generators/FullControllerGeneratorTest.php | 21 +++------------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/stubs/controller.full.stub b/src/stubs/controller.full.stub index 7ee03b6..ff18ae7 100644 --- a/src/stubs/controller.full.stub +++ b/src/stubs/controller.full.stub @@ -14,16 +14,11 @@ class MastersController extends Controller */ public function index() { - $editableMaster = null; $mstrCollections = Master::where(function ($query) { $query->where('name', 'like', '%'.request('q').'%'); })->paginate(25); - if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) { - $editableMaster = Master::find(request('id')); - } - - return view('masters.index', compact('mstrCollections', 'editableMaster')); + return view('masters.index', compact('mstrCollections')); } /** diff --git a/tests/Generators/FullControllerGeneratorTest.php b/tests/Generators/FullControllerGeneratorTest.php index e2c61c3..e6a822f 100644 --- a/tests/Generators/FullControllerGeneratorTest.php +++ b/tests/Generators/FullControllerGeneratorTest.php @@ -28,16 +28,11 @@ class {$this->plural_model_name}Controller extends Controller */ public function index() { - \$editable{$this->model_name} = null; \${$this->collection_model_var_name} = {$this->model_name}::where(function (\$query) { \$query->where('name', 'like', '%'.request('q').'%'); })->paginate(25); - if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) { - \$editable{$this->model_name} = {$this->model_name}::find(request('id')); - } - - return view('{$this->table_name}.index', compact('{$this->collection_model_var_name}', 'editable{$this->model_name}')); + return view('{$this->table_name}.index', compact('{$this->collection_model_var_name}')); } /** @@ -166,16 +161,11 @@ class CategoriesController extends Controller */ public function index() { - \$editableCategory = null; \$categories = Category::where(function (\$query) { \$query->where('name', 'like', '%'.request('q').'%'); })->paginate(25); - if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) { - \$editableCategory = Category::find(request('id')); - } - - return view('categories.index', compact('categories', 'editableCategory')); + return view('categories.index', compact('categories')); } /** @@ -305,16 +295,11 @@ class CategoriesController extends Controller */ public function index() { - \$editableCategory = null; \$categories = Category::where(function (\$query) { \$query->where('name', 'like', '%'.request('q').'%'); })->paginate(25); - if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) { - \$editableCategory = Category::find(request('id')); - } - - return view('categories.index', compact('categories', 'editableCategory')); + return view('categories.index', compact('categories')); } /**