fixing minor issue
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/98cacd5d Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/98cacd5d Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/98cacd5d Branch: refs/heads/master Commit: 98cacd5d34c76ef606b8f4e341352dbd840bbd70 Parents: 43c3e4e Author: Supun Nakandala <[email protected]> Authored: Tue May 5 02:39:00 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Tue May 5 02:39:00 2015 +0530 ---------------------------------------------------------------------- app/views/experiment/browse.blade.php | 2 +- app/views/experiment/search.blade.php | 2 +- app/views/project/browse.blade.php | 2 +- app/views/project/search.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98cacd5d/app/views/experiment/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/experiment/browse.blade.php b/app/views/experiment/browse.blade.php index f5d2a44..25c5888 100755 --- a/app/views/experiment/browse.blade.php +++ b/app/views/experiment/browse.blade.php @@ -24,7 +24,7 @@ if (isset( $expContainer)) </div> <div class="pull-left"> <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1) - . ' to ' . strval($pageNo*$limit); ?> + . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($expContainer))); ?> </div> <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> <div style="clear: both"></div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98cacd5d/app/views/experiment/search.blade.php ---------------------------------------------------------------------- diff --git a/app/views/experiment/search.blade.php b/app/views/experiment/search.blade.php index 43c95d1..c993354 100755 --- a/app/views/experiment/search.blade.php +++ b/app/views/experiment/search.blade.php @@ -80,7 +80,7 @@ </div> <div class="pull-left"> <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1) - . ' to ' . strval($pageNo*$limit); ?> + . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($expContainer))); ?> </div> <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> <div style="clear: both"></div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98cacd5d/app/views/project/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/browse.blade.php b/app/views/project/browse.blade.php index 58e4a62..90e3ada 100755 --- a/app/views/project/browse.blade.php +++ b/app/views/project/browse.blade.php @@ -30,7 +30,7 @@ </div> <div class="pull-left"> <?php if (sizeof($projects) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1) - . ' to ' . strval($pageNo*$limit); ?> + . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($projects))); ?> </div> <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> <div style="clear: both"></div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98cacd5d/app/views/project/search.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/search.blade.php b/app/views/project/search.blade.php index 4737783..f265b91 100755 --- a/app/views/project/search.blade.php +++ b/app/views/project/search.blade.php @@ -46,7 +46,7 @@ </div> <div class="pull-left"> <?php if (sizeof($projects) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1) - . ' to ' . strval($pageNo*$limit); ?> + . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($projects))); ?> </div> <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/> <div style="clear: both"></div>
