Repository: airavata-php-gateway Updated Branches: refs/heads/master 6bc3aef95 -> b993f7dc7
fixing pagination issue in experiments and projects Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b993f7dc Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b993f7dc Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b993f7dc Branch: refs/heads/master Commit: b993f7dc75e5ee1becf71f9b9d3bdb1a96d0635e Parents: 6bc3aef Author: Supun Nakandala <[email protected]> Authored: Mon Jul 6 23:26:21 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Mon Jul 6 23:26:21 2015 +0530 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 2 +- app/controllers/ProjectController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b993f7dc/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index f2140b2..5492e1e 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -234,7 +234,7 @@ class ExperimentController extends BaseController { $pageNo = Input::get('pageNo'); $prev = Input::get('prev'); - if (empty($pageNo)) { + if (empty($pageNo) || empty(Input::all()["search-value"])) { $pageNo = 1; } else { if (isset($prev)) { http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b993f7dc/app/controllers/ProjectController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php index cd39583..2f7b1b4 100755 --- a/app/controllers/ProjectController.php +++ b/app/controllers/ProjectController.php @@ -73,7 +73,7 @@ class ProjectController extends BaseController { $pageNo = Input::get('pageNo'); $prev = Input::get('prev'); - if (empty($pageNo)) { + if (empty($pageNo) || empty(Input::all()["search-value"])) { $pageNo = 1; } else { if (isset($prev)) {
