From 362cc5f092368668ffd865ebc7bf1d6c45b2456a Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Sat, 20 Feb 2016 18:04:56 +0800 Subject: [PATCH] Fixed issue where page with id 1 exists --- classes/edit_form.php | 2 +- edit.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/classes/edit_form.php b/classes/edit_form.php index 50cbf42..6f6963b 100644 --- a/classes/edit_form.php +++ b/classes/edit_form.php @@ -67,7 +67,7 @@ class edit_form extends \moodleform { } else { // Add a new template. // Create a 'fake' page to display the elements on - not yet saved in the DB. $page = new \stdClass(); - $page->id = 1; + $page->id = 0; $page->sequence = 1; $this->add_customcert_page_elements($page); } diff --git a/edit.php b/edit.php index a05d05c..a5afb53 100644 --- a/edit.php +++ b/edit.php @@ -162,23 +162,23 @@ if ($data = $mform->get_data()) { $rightmargin = 'pagerightmargin_' . $pageid; $rightmargin = 'pagerightmargin_' . $pageid; + $data->$width = $data->pagewidth_0; + $data->$height = $data->pageheight_0; + $data->$leftmargin = $data->pageleftmargin_0; + $data->$rightmargin = $data->pagerightmargin_0; + // We may also have clicked to add an element, so these need changing as well. - if (isset($data->element_1) && isset($data->addelement_1)) { + if (isset($data->element_0) && isset($data->addelement_0)) { $element = 'element_' . $pageid; $addelement = 'addelement_' . $pageid; - $data->$element = $data->element_1; - $data->$addelement = $data->addelement_1; + $data->$element = $data->element_0; + $data->$addelement = $data->addelement_0; // Need to remove the temporary element and add element placeholders so we // don't try add an element to the wrong page. - unset($data->element_1); - unset($data->addelement_1); + unset($data->element_0); + unset($data->addelement_0); } - - $data->$width = $data->pagewidth_1; - $data->$height = $data->pageheight_1; - $data->$leftmargin = $data->pageleftmargin_1; - $data->$rightmargin = $data->pagerightmargin_1; } // Save any data for the template.