Improved logic for saving and added 'guess' the visibility functionality

This commit is contained in:
Andy Miller
2015-08-05 15:30:30 -06:00
parent ac6a79f069
commit 7e1b5db4ee
3 changed files with 39 additions and 14 deletions

View File

@@ -797,18 +797,7 @@ class AdminController
$obj = $obj->move($parent);
$this->preparePage($obj);
// rename folder based on visible
if (isset($data['header']['visible'])) {
if ($data['header']['visible'] && !$obj->order()) {
// needs to have order set
$obj->order(1000);
$reorder = true;
} elseif (!$data['header']['visible'] && $obj->order()) {
// needs to have order removed
$obj->folder($obj->slug());
$reorder = true;
}
}
// Reset slug and route. For now we do not support slug twig variable on save.
$obj->slug($original_slug);
@@ -818,8 +807,24 @@ class AdminController
$obj = $this->prepareData();
}
if ($obj) {
$visible_before = $obj->visible();
$obj->validate();
$obj->filter();
$visible_after = $obj->visible();
// rename folder based on visible
if ($visible_after && !$obj->order()) {
// needs to have order set
$obj->order(1000);
$reorder = true;
} elseif (!$visible_after && $obj->order()) {
// needs to have order removed
$obj->folder($obj->slug());
$reorder = true;
}
$obj->save($reorder);
$this->admin->setMessage('Successfully saved', 'info');
}