PHRAS-1107 - fix frontend issues for orders pagination (button style and per-page parameter)

This commit is contained in:
Florian BLOUET
2016-05-19 17:38:59 +02:00
parent edaf603552
commit a9754b04e7
2 changed files with 7 additions and 3 deletions

View File

@@ -100,8 +100,12 @@ class ProdOrderController extends BaseOrderController
public function displayOrders(Request $request)
{
$page = (int) $request->query->get('page', 1);
$offsetStart = $page - 1;
$perPage = (int) $request->query->get('per-page', 10);
$offsetStart = 0;
if ($page > 0) {
$offsetStart = ($page - 1) * $perPage;
}
$sort = $request->query->get('sort');
$baseIds = array_keys($this->getAclForUser()->get_granted_base(['order_master']));

View File

@@ -62,11 +62,11 @@
<div class='well-small'>
<ul class="pager">
{% if previousPage %}
<li class="previous"><a class='self-ajax' href="{{ path('prod_orders', {'page': previousPage}) }}"><i class="icon-arrow-left"></i>{{ 'Previous' | trans }}</a></li>
<li class="previous"><a class="self-ajax btn btn-inverse" href="{{ path('prod_orders', {'page': previousPage, 'per-page': perPage}) }}">{{ 'Previous' | trans }}&nbsp;<i class="icon-arrow-left"></i></a></li>
{% endif %}
{% if nextPage %}
<li class="next"><a class='self-ajax' href="{{ path('prod_orders', {'page': nextPage}) }}"><i class="icon-arrow-right"></i>{{ 'Next' | trans }}</a></li>
<li class="next"><a class="self-ajax btn btn-inverse" href="{{ path('prod_orders', {'page': nextPage, 'per-page': perPage}) }}"><i class="icon-arrow-right"></i>&nbsp;{{ 'Next' | trans }}</a></li>
{% endif %}
</ul>
</div>