Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-30 01:36:27 +01:00
Code Issues Packages Projects Releases Activity

Handle case where $input['order'] is set but empty.

Browse Source 
Re #628 fix issue when saving a modular child folder as 05.something
and being reset to 01.something upon save
This commit is contained in:
Flavio Copes
2016-06-21 15:38:34 +02:00
parent 88f3b8192f
commit d76e75cb04
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/controller.php
View File

@@ -1750,7 +1750,7 @@ class AdminController
if ($withoutPrefix($sibling->$item()) == ($highest === 1 ? $page_item : $page_item . '-' . $highest)) { if ($withoutPrefix($sibling->$item()) == ($highest === 1 ? $page_item : $page_item . '-' . $highest)) {
$highest = $findCorrectAppendedNumber($item, $page_item, $highest + 1); $highest = $findCorrectAppendedNumber($item, $page_item, $highest + 1);
return $highest; return $highest;
} }
} }
return $highest; return $highest;
}; };
@@ -1817,14 +1817,14 @@ class AdminController
$page->rawRoute($page->parent()->rawRoute() . '/' . $slug); $page->rawRoute($page->parent()->rawRoute() . '/' . $slug);
// Append progressivenumber to the copied page title // Append progressivenumber to the copied page title
$match = preg_split('/(\d+)(?!.*\d)/', $original_page->title(), 2, PREG_SPLIT_DELIM_CAPTURE); $match = preg_split('/(\d+)(?!.*\d)/', $original_page->title(), 2, PREG_SPLIT_DELIM_CAPTURE);
$header = $page->header(); $header = $page->header();
if (!isset($match[1])) { if (!isset($match[1])) {
$header->title = $match[0] . ' 2'; $header->title = $match[0] . ' 2';
} else { } else {
$header->title = $match[0] . ((int)$match[1] + 1); $header->title = $match[0] . ((int)$match[1] + 1);
} }
$page->header($header); $page->header($header);
$page->save(false); $page->save(false);
@@ -1835,7 +1835,7 @@ class AdminController
$match = preg_split('/-(\d+)$/', $header->slug, 2, PREG_SPLIT_DELIM_CAPTURE); $match = preg_split('/-(\d+)$/', $header->slug, 2, PREG_SPLIT_DELIM_CAPTURE);
$header->slug = $match[0] . '-' . (isset($match[1]) ? (int)$match[1] + 1 : 2); $header->slug = $match[0] . '-' . (isset($match[1]) ? (int)$match[1] + 1 : 2);
} }
$page->header($header); $page->header($header);
$page->save(); $page->save();
@@ -2243,7 +2243,7 @@ class AdminController
$input = (array) $this->data; $input = (array) $this->data;
if (isset($input['order'])) { if (isset($input['order'])) {
$order = max(0, (int)isset($input['order']) ? $input['order'] : $page->value('order')); $order = max(0, ((int)isset($input['order']) && $input['order']) ? $input['order'] : $page->value('order'));
$ordering = $order ? sprintf('%02d.', $order) : ''; $ordering = $order ? sprintf('%02d.', $order) : '';
$slug = empty($input['folder']) ? $page->value('folder') : (string)$input['folder']; $slug = empty($input['folder']) ? $page->value('folder') : (string)$input['folder'];
$page->folder($ordering . $slug); $page->folder($ordering . $slug);