Merge branch '4.13' into 5.0

silverstripe · Jun 21, 2023 · fb7d225 · fb7d225
2 parents 220fee6 + ab4802c
commit fb7d225
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
@@ -428,7 +428,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
@@ -300,9 +300,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 / @@ -428,7 +428,7 @@ public function NotFirstPage() @@
          */
         public function LastPage()
         {
-            return $this->CurrentPage() == $this->TotalPages();
+            return $this->CurrentPage() >= $this->TotalPages();
         }
         /**
@@ Expand Down @@