From b25b3321f9dc06fcdf912fefa99d70c4878ab1b6 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 21 Oct 2015 14:49:24 -0700 Subject: [PATCH] Fixes skip/offset for #1266 --- app/controllers/admin/ModelsController.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 3cc5e3e17d..27faaadfac 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -373,6 +373,19 @@ class ModelsController extends AdminController $models = $models->TextSearch(Input::get('search')); } + if (Input::has('offset')) { + $offset = e(Input::get('offset')); + } else { + $offset = 0; + } + + if (Input::has('limit')) { + $limit = e(Input::get('limit')); + } else { + $limit = 50; + } + + $allowed_columns = ['name']; $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; @@ -380,7 +393,7 @@ class ModelsController extends AdminController $models = $models->orderBy($sort, $order); $modelCount = $models->count(); - $models = $models->skip(Input::get('offset'))->take(Input::get('limit'))->get(); + $models = $models->skip($offset)->take($limit)->get(); $rows = array();