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

Fixed Flex Pages bug where renaming slug causes bad ordering range after save [#2997]

Browse Source
This commit is contained in:
Matias Griese
2020-08-28 21:50:18 +03:00
parent d33627f1fe
commit 7157ed08f9
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -11,6 +11,8 @@
* Fixed `Flex Pages` bug where reordering pages causes page content to disappear if default language uses wrong extension (`.md` vs `.en.md`)
* Fixed `Flex Pages` bug where `onAdminSave` passes page as `$event['page']` instead of `$event['object']` [#2995](https://github.com/getgrav/grav/issues/2995)
* Fixed `Flex Pages` bug where changing a modular page template added duplicate file [admin#1899](https://github.com/getgrav/grav-plugin-admin/issues/1899)
* Fixed `Flex Pages` bug where renaming slug causes bad ordering range after save [#2997](https://github.com/getgrav/grav/issues/2997)
#2997
# v1.7.0-rc.15
## 07/22/2020

18
system/src/Grav/Common/Flex/Types/Pages/PageObject.php
View File

@@ -197,11 +197,16 @@ class PageObject extends FlexPageObject
// TODO: make sure that the page doesn't exist yet if moved/copied.
}
// Reorder siblings.
if ($reorder === true && !$this->root()) {
$reorder = $this->_reorder;
}
// Force automatic reorder if item is supposed to be added to the last.
if (!is_array($reorder) && (int)$this->order() >= 999999) {
$reorder = [];
}
// Reorder siblings.
$siblings = is_array($reorder) ? $this->reorderSiblings($reorder) : [];
$data = $this->prepareStorage();
@@ -309,9 +314,9 @@ class PageObject extends FlexPageObject
/** @var PageCollection|null $siblings */
$siblings = $siblings->getCollection()->withOrdered()->orderBy(['order' => 'ASC']);
$storageKey = $this->getStorageKey();
$storageKey = $this->getMasterKey();
$filesystem = Filesystem::getInstance(false);
$oldParentKey = ltrim($filesystem->dirname("/$storageKey"), '/');
$oldParentKey = ltrim($filesystem->dirname("/{$storageKey}"), '/');
$newParentKey = $this->getProperty('parent_key');
$isMoved = $oldParentKey !== $newParentKey;
$order = !$isMoved ? $this->order() : false;
@@ -326,17 +331,20 @@ class PageObject extends FlexPageObject
}
}
// Add missing siblings into the end of the list, keeping the previous ordering between them.
foreach ($siblings as $sibling) {
$basename = basename($sibling->getKey());
$basename = preg_replace('|^\d+\.|', '', $sibling->getProperty('folder'));
if (!in_array($basename, $ordering, true)) {
$ordering[] = $basename;
}
}
// Reorder.
$ordering = array_flip(array_values($ordering));
$count = count($ordering);
foreach ($siblings as $sibling) {
$newOrder = $ordering[basename($sibling->getKey())] ?? null;
$basename = preg_replace('|^\d+\.|', '', $sibling->getProperty('folder'));
$newOrder = $ordering[$basename] ?? null;
$newOrder = null !== $newOrder ? $newOrder + 1 : (int)$sibling->order() + $count;
$sibling->order($newOrder);
}