Merge 2.x into master

sonata-project · Mar 22, 2020 · 9ec8b61 · 9ec8b61
2 parents 36ff420 + 7efafcf
commit 9ec8b61
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -374,7 +374,7 @@ public function getSortParameters(FieldDescriptionInterface $fieldDescription, D
     {
         $values = $datagrid->getValues();
 
-        if ($fieldDescription->getName() === $values['_sort_by']->getName()) {
+        if ($this->isFieldAlreadySorted($fieldDescription, $datagrid)) {
             if ('ASC' === $values['_sort_order']) {
                 $values['_sort_order'] = 'DESC';
             } else {
@@ -397,7 +397,9 @@ public function getPaginationParameters(DatagridInterface $datagrid, $page)
     {
         $values = $datagrid->getValues();
 
-        $values['_sort_by'] = $values['_sort_by']->getName();
+        if (isset($values['_sort_by']) && $values['_sort_by'] instanceof FieldDescriptionInterface) {
+            $values['_sort_by'] = $values['_sort_by']->getName();
+        }
         $values['_page'] = $page;
 
         return ['filter' => $values];
@@ -550,4 +552,16 @@ protected function camelize($property)
     {
         return preg_replace(['/(^|_)+(.)/e', '/\.(.)/e'], ["strtoupper('\\2')", "'_'.strtoupper('\\1')"], $property);
     }
+
+    private function isFieldAlreadySorted(FieldDescriptionInterface $fieldDescription, DatagridInterface $datagrid): bool
+    {
+        $values = $datagrid->getValues();
+
+        if (!isset($values['_sort_by']) || !$values['_sort_by'] instanceof FieldDescriptionInterface) {
+            return false;
+        }
+
+        return $values['_sort_by']->getName() === $fieldDescription->getName()
+            || $values['_sort_by']->getName() === $fieldDescription->getOption('sortable');
+    }
 }
diff --git a/tests/Unit/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php b/tests/Unit/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php
@@ -31,6 +31,10 @@ public function testDocumentTreeDefaultValues(): void
             'kernel.bundles',
             []
         );
+        $this->container->setParameter(
+            'sonata.admin.configuration.use_intl_templates',
+            false
+        );
         $this->load(['document_tree' => []]);
 
         $this->assertContainerBuilderHasParameter(