From 3e34e7293143152f9352ca1f1d9c92afdfe3bd4c Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Tue, 26 Jul 2022 21:09:36 +0200
Subject: [PATCH] Update pagination api.

---
 app/controllers/CallbackController.php      |  6 +++---
 app/controllers/UserController.php          |  2 +-
 app/controllers/backend/LogController.php   |  2 +-
 app/controllers/backend/UserController.php  |  2 +-
 app/views/_common/_partials/pagination.volt | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/CallbackController.php b/app/controllers/CallbackController.php
index 64354d1..83376ee 100644
--- a/app/controllers/CallbackController.php
+++ b/app/controllers/CallbackController.php
@@ -25,11 +25,11 @@ class CallbackController extends ControllerBase
     {
         $paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10);
 
-        if ($paginator->getPaginate()->current > $paginator->getPaginate()->total_pages) {
+        if ($paginator->paginate()->current > $paginator->paginate()->last) {
             $paginator->setCurrentPage(1);
         }
 
-        $this->view->page = $paginator->getPaginate();
+        $this->view->page = $paginator->paginate();
         $this->view->pagination_url = '/callback/list/';
     }
 
@@ -111,7 +111,7 @@ class CallbackController extends ControllerBase
         $paginator = $callback->getRequestPaginator($page, 30);
 
         $this->view->item = $callback;
-        $this->view->page = $paginator->getPaginate();
+        $this->view->page = $paginator->paginate();
         $this->view->pagination_url = '/callback/show/' . $id . '/';
     }
 }
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index 8274167..3439c00 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -105,7 +105,7 @@ class UserController extends ControllerBase
 
         $paginator = ActivityLog::getPaginationList($user->getId(), $page);
 
-        $this->view->page = $paginator->getPaginate();
+        $this->view->page = $paginator->pageinate();
         $this->view->pagination_url = '/user/activity/';
     }
     
diff --git a/app/controllers/backend/LogController.php b/app/controllers/backend/LogController.php
index dcbe8fb..df0dba9 100644
--- a/app/controllers/backend/LogController.php
+++ b/app/controllers/backend/LogController.php
@@ -15,7 +15,7 @@ class LogController extends \Phalcon\Mvc\Controller
     {
         $paginator = ActivityLog::getAllPaginationList($page);
 
-        $this->view->page = $paginator->getPaginate();
+        $this->view->page = $paginator->paginate();
         $this->view->pagination_url = '/admin/log/';
     }
 }
diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php
index bde79ac..0bea10c 100644
--- a/app/controllers/backend/UserController.php
+++ b/app/controllers/backend/UserController.php
@@ -19,6 +19,6 @@ class UserController extends \Phalcon\Mvc\Controller
         $paginator = User::getPaginationList($page,15);
 
         $this->view->pagination_url = '/admin/user/list/';
-        $this->view->page = $paginator->getPaginate();
+        $this->view->page = $paginator->paginate();
     }
 }
diff --git a/app/views/_common/_partials/pagination.volt b/app/views/_common/_partials/pagination.volt
index 4720288..1dd6644 100644
--- a/app/views/_common/_partials/pagination.volt
+++ b/app/views/_common/_partials/pagination.volt
@@ -9,19 +9,19 @@
 
 {% set pagination_slider = 3 %}
 
-{% if (page.total_pages > 1) %}
+{% if (page.last > 1) %}
 
 <ul class="pagination">
 
-    {% if page.current !== page.before %}
+    {% if page.current !== page.previous %}
     <li>
-        <a href="{{ pagination_url ~ page.before }}">
+        <a href="{{ pagination_url ~ page.previous }}">
             {{ icon('solid/arrow-left') }} Previous
         </a>
     </li>
     {% endif %}
 
-    {% if page.total_pages > pagination_slider and page.current > (pagination_slider + 1) %}
+    {% if page.last > pagination_slider and page.current > (pagination_slider + 1) %}
     <li>
         <a href="{{ pagination_url ~ 1 }}">1</a>
     </li>
@@ -30,7 +30,7 @@
     </li>
     {% endif %}
 
-    {% for n in max(page.current - pagination_slider, 1)..min(page.current + pagination_slider, page.total_pages) %}
+    {% for n in max(page.current - pagination_slider, 1)..min(page.current + pagination_slider, page.last) %}
         {% if (n == page.current) %}
             <li class="active">
         {% else %}
@@ -40,12 +40,12 @@
             </li>
     {% endfor %}
 
-    {% if page.total_pages > pagination_slider and page.current < page.total_pages - pagination_slider %}
+    {% if page.last > pagination_slider and page.current < page.last - pagination_slider %}
     <li class="middle">
         ...
     </li>
     <li>
-        <a href="{{ pagination_url ~ page.total_pages }}">{{ page.total_pages }}</a>
+        <a href="{{ pagination_url ~ page.last }}">{{ page.last }}</a>
     </li>
     {% endif %}