mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-04-17 08:49:00 +08:00
Fix issue BookStackApp#5542 Sorting by name
This commit is contained in:
parent
0ec0913846
commit
abe7467ae5
@ -2,6 +2,7 @@
|
||||
|
||||
namespace BookStack\Sorting;
|
||||
|
||||
use voku\helper\ASCII;
|
||||
use BookStack\Entities\Models\Chapter;
|
||||
use BookStack\Entities\Models\Entity;
|
||||
|
||||
@ -13,12 +14,12 @@ class SortSetOperationComparisons
|
||||
{
|
||||
public static function nameAsc(Entity $a, Entity $b): int
|
||||
{
|
||||
return strtolower($a->name) <=> strtolower($b->name);
|
||||
return strtolower(ASCII::to_transliterate($a->name)) <=> strtolower(ASCII::to_transliterate($b->name));
|
||||
}
|
||||
|
||||
public static function nameDesc(Entity $a, Entity $b): int
|
||||
{
|
||||
return strtolower($b->name) <=> strtolower($a->name);
|
||||
return strtolower(ASCII::to_transliterate($b->name)) <=> strtolower(ASCII::to_transliterate($a->name));
|
||||
}
|
||||
|
||||
public static function nameNumericAsc(Entity $a, Entity $b): int
|
||||
|
@ -198,6 +198,8 @@ class SortRuleTest extends TestCase
|
||||
$namesToAdd = [
|
||||
"Beans",
|
||||
"bread",
|
||||
"Éclaire",
|
||||
"egg",
|
||||
"Milk",
|
||||
"pizza",
|
||||
"Tomato",
|
||||
|
Loading…
x
Reference in New Issue
Block a user