Merge branch 'hotfix/4.1.2'

pfilsx · Nov 16, 2019 · d4e15cc · d4e15cc
2 parents 9d32503 + 1801862
commit d4e15cc
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/src/Config/Configuration.php b/src/Config/Configuration.php
@@ -18,8 +18,6 @@ class Configuration implements ConfigurationInterface
 
     protected $paginationEnabled;
 
-    protected $showTitles;
-
     protected $translationDomain;
 
     public function __construct(array $config = [])

diff --git a/src/Grid/DataGrid.php b/src/Grid/DataGrid.php
@@ -227,6 +227,7 @@ protected function handleSorting(array &$queryParams)
             $this->setSort($queryParams['sortBy']);
             unset($queryParams['sortBy']);
         }
+        $this->builder->acquireSort();
     }
 
     protected function handlePagination(array &$queryParams)

diff --git a/src/Grid/DataGridBuilder.php b/src/Grid/DataGridBuilder.php
@@ -43,6 +43,8 @@ class DataGridBuilder implements DataGridBuilderInterface
 
     protected $instance = 'default';
 
+    protected $sort = null;
+
     /**
      * DataGridBuilder constructor.
      * @param DataGridServiceContainer $container
@@ -161,17 +163,36 @@ public function setProvider(DataProviderInterface $provider): void
         $this->provider = $provider;
     }
 
+    /**
+     * @param string $attribute
+     * @param string $direction
+     */
     public function setSort(string $attribute, string $direction)
     {
-        foreach ($this->columns as $column) {
-            if ($column instanceof DataColumn && $column->hasSort() && $column->getAttribute() == $attribute) {
-                $column->setSort($direction);
-                $this->provider->setSort([$attribute => $direction]);
-                break;
+        $this->sort = [$attribute, $direction];
+    }
+
+    /**
+     * @internal
+     */
+    public function acquireSort(): void
+    {
+        if (is_array($this->sort) && count($this->sort) === 2) {
+            $attribute = $this->sort[0];
+            $direction = $this->sort[1];
+            foreach ($this->columns as $column) {
+                if ($column instanceof DataColumn && $column->hasSort() && $column->getAttribute() == $attribute) {
+                    $column->setSort($direction);
+                    $this->provider->setSort([$attribute => $direction]);
+                    break;
+                }
             }
         }
     }
 
+
+
+
     /**
      * @internal
      * @return bool

diff --git a/src/Grid/DataGridBuilderInterface.php b/src/Grid/DataGridBuilderInterface.php
@@ -86,7 +86,11 @@ public function getInstance(): string;
     /**
      * @param string $attribute
      * @param string $direction
-     * @internal
      */
     public function setSort(string $attribute, string $direction);
+
+    /**
+     * @internal
+     */
+    public function acquireSort(): void;
 }
diff --git a/src/Resources/views/grid.blocks.html.twig b/src/Resources/views/grid.blocks.html.twig
@@ -17,8 +17,8 @@
                         {% else %}
                             {% set sort_attribute = {'sortBy': column.attribute} %}
                         {% endif %}
-                        <a href="{{ path(request.get('_route'),
-                            request.query|merge({'data_grid': request.query.get('data_grid')|default({})|merge(sort_attribute)})) }}"
+                        <a href="{{ path(request.attributes.get('_route'),
+                            (request.attributes.get('_route_params')|merge(request.query))|merge({'data_grid': request.query.get('data_grid')|default({})|merge(sort_attribute)})) }}"
                            class="data_grid_sort{% if column.getSort is same as('ASC') %} up{% elseif column.getSort is same as('DESC') %} down{% endif %}"
                            data-attribute="{{ column.attribute }}">{{ column.headContent }}</a>
                     {% else %}
@@ -79,8 +79,8 @@
         {% elseif i is same as(null) %}
             ...
         {% else %}
-            <a href="{{ path(request.get('_route'),
-                request.query|merge({'data_grid': request.query.get('data_grid')|default({})|merge({'page': i})})) }}"
+            <a href="{{ path(request.attributes.get('_route'),
+                (request.attributes.get('_route_params')|merge(request.query))|merge({'data_grid': request.query.get('data_grid')|default({})|merge({'page': i})})) }}"
                class="data_grid_page" data-page="{{ i }}">{{ i }}</a>
         {% endif %}
     {% endfor %}

diff --git a/tests/DataGridBuilderTest.php b/tests/DataGridBuilderTest.php
@@ -99,6 +99,7 @@ public function testSetPagination(): void
     public function testSetSort($builder): void
     {
         $builder->setSort('creationDate', 'DESC');
+        $builder->acquireSort();
         foreach ($builder->getColumns() as $column) {
             /**
              * @var $column AbstractColumn