tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 22:28:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
Guy Sartorelli 2023-06-22 11:19:59 +12:00
commit 0c40cc9b3d
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ORM/PaginatedList.php
View File

@ -428,7 +428,7 @@ class PaginatedList extends ListDecorator
*/ */
public function LastPage() public function LastPage()
{ {
return $this->CurrentPage() == $this->TotalPages(); return $this->CurrentPage() >= $this->TotalPages();
} }
/** /**

11
tests/php/ORM/PaginatedListTest.php
View File

@ -300,9 +300,20 @@ class PaginatedListTest extends SapphireTest
$list = new PaginatedList(new ArrayList()); $list = new PaginatedList(new ArrayList());
$list->setTotalItems(50); $list->setTotalItems(50);
$this->assertFalse($list->LastPage());
$list->setCurrentPage(4);
$this->assertFalse($list->LastPage()); $this->assertFalse($list->LastPage());
$list->setCurrentPage(5); $list->setCurrentPage(5);
$this->assertTrue($list->LastPage()); $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() public function testNotLastPage()