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

Merge branch 'feature/ordering-refactor' into develop

Browse Source 
# Conflicts:
#	themes/grav/css-compiled/preset.css
#	themes/grav/css-compiled/preset.css.map
This commit is contained in:
Andy Miller
2017-03-22 12:09:15 -06:00
parent 5e4a829625 bf9dd97aee
commit 306f4cef16
15 changed files with 135 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
classes/admincontroller.php
View File

@@ -496,9 +496,6 @@ class AdminController extends AdminBaseController
$obj = $obj->move($parent);
$this->preparePage($obj, false, $obj->language());
// Reset slug and route. For now we do not support slug twig variable on save.
$obj->slug($original_slug);
try {
$obj->validate();
} catch (\Exception $e) {
@@ -514,6 +511,10 @@ class AdminController extends AdminBaseController
$obj->order($original_order + 1);
}
if (isset($data['order']) && !empty($data['order'])) {
$reorder = explode(',', $data['order']);
}
// add or remove numeric prefix based on ordering value
if (isset($data['ordering'])) {
if ($data['ordering'] && !$obj->order()) {
@@ -1773,12 +1774,17 @@ class AdminController extends AdminBaseController
{
$input = (array)$this->data;
if (isset($input['order'])) {
$order = max(0,
((int)isset($input['order']) && $input['order']) ? $input['order'] : $page->value('order'));
// if (isset($input['folder']) && ) {
// $order = $page->value('order');
// $ordering = $order ? sprintf('%02d.', $order) : '';
// $slug = empty($input['folder']) ? $page->value('folder') : (string)$input['folder'];
// $page->folder($ordering . $slug);
// }
if ($input['folder'] != $page->value('folder')) {
$order = $page->value('order');
$ordering = $order ? sprintf('%02d.', $order) : '';
$slug = empty($input['folder']) ? $page->value('folder') : (string)$input['folder'];
$page->folder($ordering . $slug);
$page->folder($ordering . $input['folder']);
}
if (isset($input['name']) && !empty($input['name'])) {