Merge pull request #10829 from creative-commoners/pulls/4.13/fix-last…

…-page FIX LastPage method returns true if TotalPages equals 0
silverstripe · Jun 21, 2023 · ab4802c · ab4802c
2 parents 5303e08 + ad9df97
commit ab4802c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/ORM/PaginatedList.php b/src/ORM/PaginatedList.php
@@ -416,7 +416,7 @@ public function NotFirstPage()
      */
     public function LastPage()
     {
-        return $this->CurrentPage() == $this->TotalPages();
+        return $this->CurrentPage() >= $this->TotalPages();
     }
 
     /**

diff --git a/tests/php/ORM/PaginatedListTest.php b/tests/php/ORM/PaginatedListTest.php
@@ -303,9 +303,20 @@ public function testLastPage()
         $list = new PaginatedList(new ArrayList());
         $list->setTotalItems(50);
 
+        $this->assertFalse($list->LastPage());
+        $list->setCurrentPage(4);
         $this->assertFalse($list->LastPage());
         $list->setCurrentPage(5);
         $this->assertTrue($list->LastPage());
+        $list->setCurrentPage(6);
+        $this->assertTrue($list->LastPage());
+
+        $emptyList = new PaginatedList(new ArrayList());
+        $emptyList->setTotalItems(0);
+
+        $this->assertTrue($emptyList->LastPage());
+        $emptyList->setCurrentPage(1);
+        $this->assertTrue($emptyList->LastPage());
     }
 
     public function testNotLastPage()
-Original file line number
+Diff line change
@@ Expand Up / @@ -416,7 +416,7 @@ public function NotFirstPage() @@
          */
         public function LastPage()
         {
-            return $this->CurrentPage() == $this->TotalPages();
+            return $this->CurrentPage() >= $this->TotalPages();
         }
         /**
@@ Expand Down @@