murph/murph-core
murph/murph-core
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases 22 Wiki Activity

fix regression on crud sorting

Browse source
This commit is contained in:
Simon Vieille 2023-10-04 13:47:01 +02:00
parent 1f2edf183b
commit 7614c24012
Signed by: deblan
GPG key ID: 579388D585F70417
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
## [Unreleased] ## [Unreleased]
### Fixed
* fix regression on crud sorting
## [v1.22.0] 2023-09-28 ## [v1.22.0] 2023-09-28
### Added ### Added
* add new options in BooleanField: `toggle|checkbox_class_when_true` and `toggle|checkbox_class_when_false` * add new options in BooleanField: `toggle|checkbox_class_when_true` and `toggle|checkbox_class_when_false`

10
src/core/Controller/Admin/Crud/CrudController.php
View file

@ -401,10 +401,10 @@ abstract class CrudController extends AdminController
$sessionSortName = sprintf('%s_label', $sessionId); $sessionSortName = sprintf('%s_label', $sessionId);
$sessionSortDirection = sprintf('%s_direction', $sessionId); $sessionSortDirection = sprintf('%s_direction', $sessionId);
$name = strtolower($request->query->get( $name = $request->query->get(
'_sort', '_sort',
$session->get($sessionSortName, $defaultSort['label'] ?? 'asc') $session->get($sessionSortName, $defaultSort['label'] ?? null)
)); );
$direction = strtolower($request->query->get( $direction = strtolower($request->query->get(
'_sort_direction', '_sort_direction',
@ -414,6 +414,10 @@ abstract class CrudController extends AdminController
$session->set($sessionSortName, $name); $session->set($sessionSortName, $name);
$session->set($sessionSortDirection, $direction); $session->set($sessionSortDirection, $direction);
if (empty($name)) {
return;
}
if (!in_array($direction, ['asc', 'desc'])) { if (!in_array($direction, ['asc', 'desc'])) {
$direction = 'asc'; $direction = 'asc';
} }