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

Change model query on Controller@index method

tags/1.1.6
Nafies Luthfi 8 years ago
parent
28889f2e42
commit
fb9be0f0a3
6 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/stubs/controller.api.stub
  2. 6
      src/stubs/controller.full.stub
  3. 6
      src/stubs/controller.simple.stub
  4. 6
      tests/Generators/Api/ApiControllerGeneratorTest.php
  5. 18
      tests/Generators/FullControllerGeneratorTest.php
  6. 18
      tests/Generators/Simple/SimpleControllerGeneratorTest.php

6
src/stubs/controller.api.stub
View File

@ -15,9 +15,9 @@ class MastersController extends Controller
*/
public function index()
{
$mstrCollections = Master::where(function ($query) {
$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
$singleMstrQuery = Master::query();
$singleMstrQuery->where('name', 'like', '%'.request('q').'%');
$mstrCollections = $singleMstrQuery->paginate(25);
return $mstrCollections;
}

6
src/stubs/controller.full.stub
View File

@ -14,9 +14,9 @@ class MastersController extends Controller
*/
public function index()
{
$mstrCollections = Master::where(function ($query) {
$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
$singleMstrQuery = Master::query();
$singleMstrQuery->where('name', 'like', '%'.request('q').'%');
$mstrCollections = $singleMstrQuery->paginate(25);
return view('masters.index', compact('mstrCollections'));
}

6
src/stubs/controller.simple.stub
View File

@ -15,9 +15,9 @@ class MastersController extends Controller
public function index()
{
$editableMaster = null;
$mstrCollections = Master::where(function ($query) {
$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
$singleMstrQuery = Master::query();
$singleMstrQuery->where('name', 'like', '%'.request('q').'%');
$mstrCollections = $singleMstrQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
$editableMaster = Master::find(request('id'));

6
tests/Generators/Api/ApiControllerGeneratorTest.php
View File

@ -29,9 +29,9 @@ class {$this->plural_model_name}Controller extends Controller
*/
public function index()
{
\${$this->collection_model_var_name} = {$this->model_name}::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('name', 'like', '%'.request('q').'%');
\${$this->collection_model_var_name} = \${$this->single_model_var_name}Query->paginate(25);
return \${$this->collection_model_var_name};
}

18
tests/Generators/FullControllerGeneratorTest.php
View File

@ -28,9 +28,9 @@ class {$this->plural_model_name}Controller extends Controller
*/
public function index()
{
\${$this->collection_model_var_name} = {$this->model_name}::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('name', 'like', '%'.request('q').'%');
\${$this->collection_model_var_name} = \${$this->single_model_var_name}Query->paginate(25);
return view('{$this->table_name}.index', compact('{$this->collection_model_var_name}'));
}
@ -161,9 +161,9 @@ class CategoriesController extends Controller
*/
public function index()
{
\$categories = Category::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\$categoryQuery = Category::query();
\$categoryQuery->where('name', 'like', '%'.request('q').'%');
\$categories = \$categoryQuery->paginate(25);
return view('categories.index', compact('categories'));
}
@ -295,9 +295,9 @@ class CategoriesController extends Controller
*/
public function index()
{
\$categories = Category::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\$categoryQuery = Category::query();
\$categoryQuery->where('name', 'like', '%'.request('q').'%');
\$categories = \$categoryQuery->paginate(25);
return view('categories.index', compact('categories'));
}

18
tests/Generators/Simple/SimpleControllerGeneratorTest.php
View File

@ -29,9 +29,9 @@ 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);
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('name', 'like', '%'.request('q').'%');
\${$this->collection_model_var_name} = \${$this->single_model_var_name}Query->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
\$editable{$this->model_name} = {$this->model_name}::find(request('id'));
@ -133,9 +133,9 @@ class CategoriesController extends Controller
public function index()
{
\$editableCategory = null;
\$categories = Category::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\$categoryQuery = Category::query();
\$categoryQuery->where('name', 'like', '%'.request('q').'%');
\$categories = \$categoryQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
\$editableCategory = Category::find(request('id'));
@ -238,9 +238,9 @@ class CategoriesController extends Controller
public function index()
{
\$editableCategory = null;
\$categories = Category::where(function (\$query) {
\$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
\$categoryQuery = Category::query();
\$categoryQuery->where('name', 'like', '%'.request('q').'%');
\$categories = \$categoryQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
\$editableCategory = Category::find(request('id'));

Write Preview
Loading…
Cancel
Save