diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f3c13b3..294bc78b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Fixed missing method `translated()` in `Flex Pages` * Fixed missing `Flex Pages` in site if multi-language support has been enabled * Fixed Grav using blueprints and form fields from disabled plugins + * Fixed default Flex Pages collection ordering to order by filesystem path # v1.7.7 ## 02/23/2021 diff --git a/system/blueprints/flex/pages.yaml b/system/blueprints/flex/pages.yaml index 963ce6d24..ee2e7e5fa 100644 --- a/system/blueprints/flex/pages.yaml +++ b/system/blueprints/flex/pages.yaml @@ -176,7 +176,7 @@ config: indexed: true # Set default ordering of the pages ordering: - key: ASC + storage_key: ASC search: # Search options options: diff --git a/system/src/Grav/Framework/Flex/FlexIndex.php b/system/src/Grav/Framework/Flex/FlexIndex.php index 98f6c8bbb..e55b0127c 100644 --- a/system/src/Grav/Framework/Flex/FlexIndex.php +++ b/system/src/Grav/Framework/Flex/FlexIndex.php @@ -380,7 +380,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde // Handle primary key alias. $keyField = $this->getFlexDirectory()->getStorage()->getKeyField(); - if (isset($orderings[$keyField])) { + if ($keyField !== 'storage_key' && isset($orderings[$keyField])) { $orderings['key'] = $orderings[$keyField]; unset($orderings[$keyField]); }