fix creating page range

ongr-io · Nov 22, 2017 · e261db6 · e261db6
1 parent d2bef45
commit e261db6
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/Filter/ViewData/PagerAwareViewData.php b/Filter/ViewData/PagerAwareViewData.php
@@ -173,36 +173,37 @@ public function isLastPage()
      */
     public function getPages()
     {
+        if ($this->numPages <= 1) {
+            return [];
+        }
+
+        if ($this->numPages <= $this->maxPages) {
+            return range(1, $this->numPages);
+        }
+
+        // Determine the sliding range, centered around the current page.
         $numAdjacents = (int) floor(($this->maxPages - 3) / 2);
 
         if ($this->currentPage + $numAdjacents > $this->numPages) {
-            $begin = $this->numPages - $this->maxPages + 2;
+            $slidingStart = $this->numPages - $this->maxPages + 2;
         } else {
-            $begin = $this->currentPage - $numAdjacents;
+            $slidingStart = $this->currentPage - $numAdjacents;
         }
-        if ($begin < 2) {
-            $begin = 2;
+
+        if ($slidingStart < 2) {
+            $slidingStart = 2;
         }
 
-        $end = $begin + $this->maxPages - 2;
-//        if ($end >= $this->numPages) $end = $this->numPages - 1;
+        $slidingEnd = $slidingStart + $this->maxPages - 3;
 
-//        $tmpBegin = $this->maxPages - floor($this->maxPages / 2);
-//        $tmpEnd = $tmpBegin + $this->maxPages - 1;
-//
-//        if ($tmpBegin < 1) {
-//            $tmpEnd += 1 - $tmpBegin;
-//            $tmpBegin = 1;
-//        }
-//
-//        if ($tmpEnd > $this->getLastPage()) {
-//            $tmpBegin -= $tmpEnd - $this->getLastPage();
-//            $tmpEnd = $this->getLastPage();
-//        }
-//
-//        $begin = min($tmpBegin, 2);
-//        $end = $tmpEnd;
+        if ($slidingEnd >= $this->numPages) {
+            $slidingEnd = $this->numPages - 1;
+        }
 
-        return range($begin, $end, 1);
+        return array_merge(
+            [1],
+            range($slidingStart, $slidingEnd),
+            [$this->numPages]
+        );
     }
 }