RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 15:29:26 +03:00
Code Issues Projects Releases Wiki Activity

Fixed returned range bug(s)

Browse Source
This commit is contained in:
wernerm 2008-01-11 14:50:34 +00:00
parent c6e2086798
commit e01809d19a
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Doctrine/Pager/Range/Sliding.php
View File

@ -81,7 +81,12 @@ class Doctrine_Pager_Range_Sliding extends Doctrine_Pager_Range
*/ */
protected function _setChunkLength($chunkLength) protected function _setChunkLength($chunkLength)
{ {
$this->_chunkLength = $chunkLength; $chunkLength = (int) $chunkLength;
if (!$chunkLength) {
$chunkLength = 1;
} else {
$this->_chunkLength = $chunkLength;
}
} }
@ -95,25 +100,29 @@ class Doctrine_Pager_Range_Sliding extends Doctrine_Pager_Range
public function rangeAroundPage() public function rangeAroundPage()
{ {
$pager = $this->getPager(); $pager = $this->getPager();
$page = $pager->getPage(); $page = $pager->getPage();
$pages = $pager->getLastPage();
// Define initial assignments for StartPage and EndPage $chunk = $this->getChunkLength();
$startPage = $page - floor($this->getChunkLength() - 1) / 2; if ($chunk > $pages) {
$endPage = ($startPage + $this->getChunkLength()) - 1; $chunk = $pages;
// Check for EndPage out-range
if ($endPage > $pager->getLastPage()) {
$offset = $endPage - $pager->getLastPage();
$endPage = $pager->getLastPage();
$startPage = $startPage - $offset;
} }
// Check for StartPage out-range $chunkStart = $page - (floor($chunk / 2));
if ($startPage < $pager->getFirstPage()) { $chunkEnd = $page + (ceil($chunk / 2)-1);
$startPage = $pager->getFirstPage();
if ($chunkStart < 1) {
$adjust = 1 - $chunkStart;
$chunkStart = 1;
$chunkEnd = $chunkEnd + $adjust;
}
if ($chunkEnd > $pages) {
$adjust = $chunkEnd - $pages;
$chunkStart = $chunkStart - $adjust;
$chunkEnd = $pages;
} }
return range($startPage, $endPage); return range($chunkStart, $chunkEnd);
} }
} }