forge-joniko/ldc-agis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Noah Lancien 2024-11-06 09:59:25 +01:00
commit d39a2696bb
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Fo/NewsController.php
View file

@ -63,7 +63,7 @@ class NewsController extends Controller
})
->orderBy('publish_at', 'desc')
->get();
$newsModels = CollectionHelper::paginateManually($newsModels, 12, request()->page);
$newsModels = CollectionHelper::paginateManually($newsModels, 12, request()->page ?? 1);
return response()->json($newsModels);
}
}

2
app/Http/Controllers/Fo/ProductController.php
View file

@ -39,7 +39,7 @@ class ProductController extends Controller
->where('range_id', request()->range_id)
->orderBy('order', 'asc')
->get();
$productModels = CollectionHelper::paginateManually($productModels, 12, request()->page);
$productModels = CollectionHelper::paginateManually($productModels, 12, request()->page ?? 1);
return response()->json($productModels);
}
}

2
app/Http/Controllers/Fo/RangeController.php
View file

@ -59,7 +59,7 @@ class RangeController extends Controller
->where('published', true)
->orderBy('order', 'asc')
->get();
$productModels = CollectionHelper::paginateManually($productModels, 12, request()->page);
$productModels = CollectionHelper::paginateManually($productModels, 12, request()->page ?? 1);
return response()->json($productModels);
}
}