pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Update pagination api.

Browse source
This commit is contained in:
Henrik Hautakoski 2022-07-26 21:09:36 +02:00
parent 191f1c1930
commit 3e34e72931
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/CallbackController.php
View file

@ -25,11 +25,11 @@ class CallbackController extends ControllerBase
{ {
$paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10); $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); $paginator->setCurrentPage(1);
} }
$this->view->page = $paginator->getPaginate(); $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/list/'; $this->view->pagination_url = '/callback/list/';
} }
@ -111,7 +111,7 @@ class CallbackController extends ControllerBase
$paginator = $callback->getRequestPaginator($page, 30); $paginator = $callback->getRequestPaginator($page, 30);
$this->view->item = $callback; $this->view->item = $callback;
$this->view->page = $paginator->getPaginate(); $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/show/' . $id . '/'; $this->view->pagination_url = '/callback/show/' . $id . '/';
} }
} }

2
app/controllers/UserController.php
View file

@ -105,7 +105,7 @@ class UserController extends ControllerBase
$paginator = ActivityLog::getPaginationList($user->getId(), $page); $paginator = ActivityLog::getPaginationList($user->getId(), $page);
$this->view->page = $paginator->getPaginate(); $this->view->page = $paginator->pageinate();
$this->view->pagination_url = '/user/activity/'; $this->view->pagination_url = '/user/activity/';
} }

2
app/controllers/backend/LogController.php
View file

@ -15,7 +15,7 @@ class LogController extends \Phalcon\Mvc\Controller
{ {
$paginator = ActivityLog::getAllPaginationList($page); $paginator = ActivityLog::getAllPaginationList($page);
$this->view->page = $paginator->getPaginate(); $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/admin/log/'; $this->view->pagination_url = '/admin/log/';
} }
} }

2
app/controllers/backend/UserController.php
View file

@ -19,6 +19,6 @@ class UserController extends \Phalcon\Mvc\Controller
$paginator = User::getPaginationList($page,15); $paginator = User::getPaginationList($page,15);
$this->view->pagination_url = '/admin/user/list/'; $this->view->pagination_url = '/admin/user/list/';
$this->view->page = $paginator->getPaginate(); $this->view->page = $paginator->paginate();
} }
} }

14
app/views/_common/_partials/pagination.volt
View file

@ -9,19 +9,19 @@
{% set pagination_slider = 3 %} {% set pagination_slider = 3 %}
{% if (page.total_pages > 1) %} {% if (page.last > 1) %}
<ul class="pagination"> <ul class="pagination">
{% if page.current !== page.before %} {% if page.current !== page.previous %}
<li> <li>
<a href="{{ pagination_url ~ page.before }}"> <a href="{{ pagination_url ~ page.previous }}">
{{ icon('solid/arrow-left') }} Previous {{ icon('solid/arrow-left') }} Previous
</a> </a>
</li> </li>
{% endif %} {% 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> <li>
<a href="{{ pagination_url ~ 1 }}">1</a> <a href="{{ pagination_url ~ 1 }}">1</a>
</li> </li>
@ -30,7 +30,7 @@
</li> </li>
{% endif %} {% 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) %} {% if (n == page.current) %}
<li class="active"> <li class="active">
{% else %} {% else %}
@ -40,12 +40,12 @@
</li> </li>
{% endfor %} {% 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 class="middle">
... ...
</li> </li>
<li> <li>
<a href="{{ pagination_url ~ page.total_pages }}">{{ page.total_pages }}</a> <a href="{{ pagination_url ~ page.last }}">{{ page.last }}</a>
</li> </li>
{% endif %} {% endif %}