diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 53b8059dadc48e44dbb0648be788ebcab6eeea6b..305e8dc5466c207bdbb6e6023d4f30201afd2535 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -1436,6 +1436,7 @@ BEGIN WHERE IF(pFilter = 'all', TRUE, requests.Status = pFilter) AND requests.Title != '' AND requests.Description != '' + ORDER BY requests.Date DESC LIMIT pCount OFFSET pOffset; END// @@ -1447,8 +1448,7 @@ BEGIN AS Num FROM requests WHERE requests.Title != '' AND - requests.Description != '' - ; + requests.Description != ''; END// DELIMITER ; diff --git a/~dev_rating/application/classes/Controller/Admin/Requests.php b/~dev_rating/application/classes/Controller/Admin/Requests.php index d28416ff8e3098cfc94106096cc9fdadc325747e..e4627beb9376c9731dc0c757b2b23310575cf45c 100644 --- a/~dev_rating/application/classes/Controller/Admin/Requests.php +++ b/~dev_rating/application/classes/Controller/Admin/Requests.php @@ -8,12 +8,12 @@ class Controller_Admin_Requests extends Controller_Environment_Admin } public function action_errors() { - $itemsOnPage = 5; //$_GET['count']; - $pageNum = $_GET['page']; - if ($pageNum == null) { - $pageNum = 1; + $itemsOnPage = 20; //$_GET['count']; + $currentPage = $_GET['page']; + if ($currentPage == null) { + $currentPage = 1; } - $offset = ($pageNum - 1) * $itemsOnPage; + $offset = ($currentPage - 1) * $itemsOnPage; $reports = Model_Support::getReports($this->user->ID, $offset, $itemsOnPage); if ($reports == null) { throw new HTTP_Exception_404('Picture not found'); @@ -24,7 +24,8 @@ class Controller_Admin_Requests extends Controller_Environment_Admin $this->twig->set([ 'Requests' => $reports, - 'PagesNum' => $pagesNum + 'PagesNum' => $pagesNum, + 'CurrentPage' => $currentPage ])->set_filename('admin/requests/errors'); } diff --git a/~dev_rating/application/views/admin/requests/errors.twig b/~dev_rating/application/views/admin/requests/errors.twig index daaa1e9f368011f9c13e2ba614156fb300423259..3017ffc82d34888e2ec6764b908bd30d9a5cdbe1 100644 --- a/~dev_rating/application/views/admin/requests/errors.twig +++ b/~dev_rating/application/views/admin/requests/errors.twig @@ -9,7 +9,6 @@ {% block main_content %} <div></div> - {{ PagesNum }} <div class="listPage1"> {% for req in Requests %} @@ -32,4 +31,13 @@ </div> {% endfor %} </div> + <div> + {% for i in 1..PagesNum %} + {% if i == CurrentPage %} + {{ i }} + {% else %} + {{ HTML.anchor("admin/requests/errors?page="~i, i) | raw }} + {% endif %} + {% endfor %} + </div> {% endblock %}