From 5fc92098c13d02a180a565221daee62a3247ab2c Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Tue, 1 Sep 2026 13:57:19 -0400
Subject: [PATCH 1/2] Ensure page count is integer in gotoPage function
 (CFM-546)

---
 app/templates/element/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/element/pagination.php b/app/templates/element/pagination.php
index d8249254a..973b77a09 100644
--- a/app/templates/element/pagination.php
+++ b/app/templates/element/pagination.php
@@ -61,7 +61,7 @@
             class="pagination-form"
             method="get"
             onsubmit="gotoPage(this.pageNum.value,
-              <?= $this->Paginator->counter('{{pages}}') ?>,
+              <?= $this->Paginator->param('pageCount') ?>,
               '<?= __d('error', 'pagenum.nan') ?>',
               '<?= __d('error', 'pagenum.exceeded', [$this->Paginator->counter('{{pages}}')]) ?>',
               '<?= $this->Paginator->generateUrl() ?>');

From f2e8f37c984f773ac8d4b3030ab023afb5b12464 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 3 Sep 2026 10:52:14 -0400
Subject: [PATCH 2/2] Improve calls to Paginator (CFM-546)

---
 app/templates/element/pagination.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/element/pagination.php b/app/templates/element/pagination.php
index 973b77a09..ceba9f098 100644
--- a/app/templates/element/pagination.php
+++ b/app/templates/element/pagination.php
@@ -61,7 +61,7 @@
             class="pagination-form"
             method="get"
             onsubmit="gotoPage(this.pageNum.value,
-              <?= $this->Paginator->param('pageCount') ?>,
+              <?= $this->Paginator->total() ?>,
               '<?= __d('error', 'pagenum.nan') ?>',
               '<?= __d('error', 'pagenum.exceeded', [$this->Paginator->counter('{{pages}}')]) ?>',
               '<?= $this->Paginator->generateUrl() ?>');
@@ -71,7 +71,7 @@ class="pagination-form"
         <input type="submit" value="<?= __d('operation', 'go') ?>"/>
       </form>
 
-      <?php if($this->Paginator->counter('{{count}}') > 20): ?>
+      <?php if(($this->Paginator->param('totalCount') ?? 0) > 20): ?>
         <?= $this->Form->create(null, [ 'type' => 'get', 'id' => 'set-pagination-form', 'class' => 'pagination-form' ]) ?>
         <?php
         // Provide a form for setting the page limit.