Browse Source

Fix paginator defaulting for multi-default-sort.

mscherer 7 years ago
parent
commit
756cf7e4a8
2 changed files with 2 additions and 1 deletions
  1. 1 1
      src/Datasource/Paginator.php
  2. 1 0
      src/View/Helper/PaginatorHelper.php

+ 1 - 1
src/Datasource/Paginator.php

@@ -221,7 +221,7 @@ class Paginator implements PaginatorInterface
             'nextPage' => $count > ($page * $limit),
             'pageCount' => $pageCount,
             'sort' => $options['sort'],
-            'direction' => current($order),
+            'direction' => isset($options['sort']) ? current($order) : null,
             'limit' => $defaults['limit'] != $limit ? $limit : null,
             'sortDefault' => $sortDefault,
             'directionDefault' => $directionDefault,

+ 1 - 0
src/View/Helper/PaginatorHelper.php

@@ -436,6 +436,7 @@ class PaginatorHelper extends Helper
 
             $title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
         }
+
         $defaultDir = isset($options['direction']) ? strtolower($options['direction']) : 'asc';
         unset($options['direction']);