Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-04 13:50:13 +01:00
Code Issues Packages Projects Releases Activity

Fixed sorting by groups in Flex Users

Browse Source
This commit is contained in:
Matias Griese
2020-11-09 20:44:37 +02:00
parent d3f1f833ab
commit b50dbf3ff0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -21,6 +21,7 @@
* Fixed bug in collections where filter `type: false` did not work
* Fixed `print_r()` in twig
* Fixed sorting by groups in `Flex Users`
* Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958)
# v1.7.0-rc.17
## 10/07/2020

7
system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
View File

@@ -55,8 +55,11 @@ trait PageTranslateTrait
} elseif ('' === $code) {
$object = $this->getLanguage() ? $this->getFlexDirectory()->getObject($this->getMasterKey(), 'storage_key') : $this;
} else {
$key = $this->getStorageKey() . '|.' . $code;
$meta = ['storage_key' => $key, 'lang' => $code] + $this->getMetaData();
$meta = $this->getMetaData();
$meta['template'] = $this->getLanguageTemplates()[$code] ?? $meta['template'];
$key = $this->getStorageKey() . '|' . $meta['template'] . '.' . $code;
$meta['storage_key'] = $key;
$meta['lang'] = $code;
$object = $this->getFlexDirectory()->loadObjects([$key => $meta])[$key] ?? null;
}