Skip to content

fix: multiple pagers with models do not work #6211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2022
Merged

fix: multiple pagers with models do not work #6211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d20587
fix: multiple pagers with models do not work
kenjis Jun 30, 2022
3476eb6
test: fix and add test
kenjis Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/BaseModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,8 @@ public function errors(bool $forceDB = false)
*/
public function paginate(?int $perPage = null, string $group = 'default', ?int $page = null, int $segment = 0)
{
$pager = Services::pager(null, null, false);
// Since multiple models may use the Pager, the Pager must be shared.
$pager = Services::pager();

if ($segment) {
$pager->setSegment($segment, $group);
Expand Down
26 changes: 26 additions & 0 deletions tests/system/Models/PaginateModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,30 @@ public function testPaginatePageOutOfRange(): void
$this->model->paginate(1, 'default', 500);
$this->assertSame($this->model->pager->getPageCount(), $this->model->pager->getCurrentPage());
}

public function testMultiplePager(): void
{
$_GET = [];

$validModel = $this->createModel(ValidModel::class);
$userModel = $this->createModel(UserModel::class);

$validModel->paginate(1, 'valid');
$userModel->paginate(1, 'user');
$pager = $this->model->pager;

$this->assertSame($userModel->pager, $validModel->pager);

$this->assertSame(4, $validModel->countAllResults());
$this->assertSame(4, $userModel->countAllResults());

$this->assertStringContainsString('?page_valid=1"', $pager->links('valid'));
$this->assertStringContainsString('?page_valid=2"', $pager->links('valid'));
$this->assertStringContainsString('?page_valid=3"', $pager->links('valid'));
$this->assertStringContainsString('?page_valid=4"', $pager->links('valid'));
$this->assertStringContainsString('?page_user=1"', $pager->links('user'));
$this->assertStringContainsString('?page_user=2"', $pager->links('user'));
$this->assertStringContainsString('?page_user=3"', $pager->links('user'));
$this->assertStringContainsString('?page_user=4"', $pager->links('user'));
}
}