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

Add orderBy on index model query

pull/29/head
Nafies Luthfi 5 years ago
parent
fe9e6e7296
commit
8898d6e8fb
8 changed files with 36 additions and 24 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. 5
      src/stubs/controllers/api.stub
  2. 5
      src/stubs/controllers/full-formrequests.stub
  3. 5
      src/stubs/controllers/full.stub
  4. 5
      src/stubs/controllers/simple.stub
  5. 5
      tests/CommandOptions/FullCrudFormRequestOptionsTest.php
  6. 5
      tests/Generators/Api/ApiControllerGeneratorTest.php
  7. 15
      tests/Generators/FullControllerGeneratorTest.php
  8. 15
      tests/Generators/Simple/SimpleControllerGeneratorTest.php

5
src/stubs/controllers/api.stub
View File

@ -13,10 +13,11 @@ class MasterController extends Controller
*
* @return \Illuminate\Http\JsonResponse
*/
public function index()
public function index(Request $request)
{
$singleMstrQuery = Master::query();
$singleMstrQuery->where('title', 'like', '%'.request('q').'%');
$singleMstrQuery->where('title', 'like', '%'.$request->get('q').'%');
$singleMstrQuery->orderBy('title');
$mstrCollections = $singleMstrQuery->paginate(25);
return $mstrCollections;

5
src/stubs/controllers/full-formrequests.stub
View File

@ -14,10 +14,11 @@ class MasterController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request $request)
{
$singleMstrQuery = Master::query();
$singleMstrQuery->where('title', 'like', '%'.request('q').'%');
$singleMstrQuery->where('title', 'like', '%'.$request->get('q').'%');
$singleMstrQuery->orderBy('title');
$mstrCollections = $singleMstrQuery->paginate(25);
return view('masters.index', compact('mstrCollections'));

5
src/stubs/controllers/full.stub
View File

@ -12,10 +12,11 @@ class MasterController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request $request)
{
$singleMstrQuery = Master::query();
$singleMstrQuery->where('title', 'like', '%'.request('q').'%');
$singleMstrQuery->where('title', 'like', '%'.$request->get('q').'%');
$singleMstrQuery->orderBy('title');
$mstrCollections = $singleMstrQuery->paginate(25);
return view('masters.index', compact('mstrCollections'));

5
src/stubs/controllers/simple.stub
View File

@ -12,11 +12,12 @@ class MasterController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request $request)
{
$editableMaster = null;
$singleMstrQuery = Master::query();
$singleMstrQuery->where('title', 'like', '%'.request('q').'%');
$singleMstrQuery->where('title', 'like', '%'.$request->get('q').'%');
$singleMstrQuery->orderBy('title');
$mstrCollections = $singleMstrQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {

5
tests/CommandOptions/FullCrudFormRequestOptionsTest.php
View File

@ -59,10 +59,11 @@ class {$this->model_name}Controller extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('title', 'like', '%'.request('q').'%');
\${$this->single_model_var_name}Query->where('title', 'like', '%'.\$request->get('q').'%');
\${$this->single_model_var_name}Query->orderBy('title');
\${$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}'));

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

@ -27,10 +27,11 @@ class {$this->model_name}Controller extends Controller
*
* @return \Illuminate\Http\JsonResponse
*/
public function index()
public function index(Request \$request)
{
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('title', 'like', '%'.request('q').'%');
\${$this->single_model_var_name}Query->where('title', 'like', '%'.\$request->get('q').'%');
\${$this->single_model_var_name}Query->orderBy('title');
\${$this->collection_model_var_name} = \${$this->single_model_var_name}Query->paginate(25);
return \${$this->collection_model_var_name};

15
tests/Generators/FullControllerGeneratorTest.php
View File

@ -26,10 +26,11 @@ class {$this->model_name}Controller extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('title', 'like', '%'.request('q').'%');
\${$this->single_model_var_name}Query->where('title', 'like', '%'.\$request->get('q').'%');
\${$this->single_model_var_name}Query->orderBy('title');
\${$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}'));
@ -156,10 +157,11 @@ class CategoryController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\$categoryQuery = Category::query();
\$categoryQuery->where('title', 'like', '%'.request('q').'%');
\$categoryQuery->where('title', 'like', '%'.\$request->get('q').'%');
\$categoryQuery->orderBy('title');
\$categories = \$categoryQuery->paginate(25);
return view('categories.index', compact('categories'));
@ -287,10 +289,11 @@ class CategoryController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\$categoryQuery = Category::query();
\$categoryQuery->where('title', 'like', '%'.request('q').'%');
\$categoryQuery->where('title', 'like', '%'.\$request->get('q').'%');
\$categoryQuery->orderBy('title');
\$categories = \$categoryQuery->paginate(25);
return view('categories.index', compact('categories'));

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

@ -26,11 +26,12 @@ class {$this->model_name}Controller extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\$editable{$this->model_name} = null;
\${$this->single_model_var_name}Query = {$this->model_name}::query();
\${$this->single_model_var_name}Query->where('title', 'like', '%'.request('q').'%');
\${$this->single_model_var_name}Query->where('title', 'like', '%'.\$request->get('q').'%');
\${$this->single_model_var_name}Query->orderBy('title');
\${$this->collection_model_var_name} = \${$this->single_model_var_name}Query->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
@ -129,11 +130,12 @@ class CategoryController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\$editableCategory = null;
\$categoryQuery = Category::query();
\$categoryQuery->where('title', 'like', '%'.request('q').'%');
\$categoryQuery->where('title', 'like', '%'.\$request->get('q').'%');
\$categoryQuery->orderBy('title');
\$categories = \$categoryQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
@ -233,11 +235,12 @@ class CategoryController extends Controller
*
* @return \Illuminate\View\View
*/
public function index()
public function index(Request \$request)
{
\$editableCategory = null;
\$categoryQuery = Category::query();
\$categoryQuery->where('title', 'like', '%'.request('q').'%');
\$categoryQuery->where('title', 'like', '%'.\$request->get('q').'%');
\$categoryQuery->orderBy('title');
\$categories = \$categoryQuery->paginate(25);
if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {

Write Preview
Loading…
Cancel
Save