mirror of
https://github.com/getformwork/formwork.git
synced 2025-01-17 13:38:22 +01:00
Prepare merge
This commit is contained in:
parent
a0043ef120
commit
2bae9faaa3
@ -174,16 +174,16 @@ class PagesController extends AbstractController
|
||||
try {
|
||||
// Validate fields against data
|
||||
$fields->setValuesFromRequest($this->request, null)->validate();
|
||||
|
||||
|
||||
$forceUpdate = false;
|
||||
|
||||
|
||||
if ($this->request->query()->has('publish')) {
|
||||
$fields->setValues(['published' => Constraint::isTruthy($this->request->query()->get('publish'))]);
|
||||
$forceUpdate = true;
|
||||
}
|
||||
|
||||
$error = false;
|
||||
|
||||
|
||||
// Update the page
|
||||
$page = $this->updatePage($page, $data, $fields, force: $forceUpdate);
|
||||
|
||||
|
56
panel/assets/js/app.min.js
vendored
56
panel/assets/js/app.min.js
vendored
File diff suppressed because one or more lines are too long
@ -172,7 +172,7 @@ export class Pages {
|
||||
if (commandPreview) {
|
||||
const editorForm = app.forms["page-editor-form"];
|
||||
|
||||
const pageParent = $("#page-parent", editorForm.element) as HTMLInputElement;
|
||||
const pageParent = $("#parent", editorForm.element) as HTMLInputElement;
|
||||
const previousParent = pageParent.value;
|
||||
|
||||
if (editorForm) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user