Merge ef1367c into b9974ec

sonata-project · Mar 26, 2020 · 88453d4 · 88453d4
2 parents b9974ec + ef1367c
commit 88453d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -411,9 +411,8 @@ public function getPaginationParameters(DatagridInterface $datagrid, $page)
     public function getDefaultSortValues($class)
     {
         return [
-            '_sort_order' => 'ASC',
-            '_sort_by' => $this->getModelIdentifier($class),
             '_page' => 1,
+            '_per_page' => 25,
         ];
     }
 

diff --git a/tests/WebTest/Admin/ContentAdminTest.php b/tests/WebTest/Admin/ContentAdminTest.php
@@ -29,6 +29,11 @@ public function testContentList(): void
         $crawler = $this->client->request('GET', '/admin/fixtures/app/content/list');
         $res = $this->client->getResponse();
 
+        $exceptionMessage = $crawler->filter('.exception-message');
+        if ($exceptionMessage->count() > 0) {
+            echo $exceptionMessage->text();
+        }
+
         $this->assertResponseSuccess($res);
         $this->assertCount(1, $crawler->filter('html:contains("Content 1")'));
     }