From: skodak Date: Tue, 5 Dec 2006 09:37:31 +0000 (+0000) Subject: added cancel button to assignment forms MDL-7778 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5571b5f4f8cd4c33e4fb8c42f8b1b353d9c9b7f1;p=moodle.git added cancel button to assignment forms MDL-7778 --- diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 20b2ecaa82..00b4243bdb 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -58,6 +58,10 @@ class assignment_online extends assignment_base { } $mform->set_defaults($defaults); + if ($mform->is_cancelled()) { + redirect('view.php?id='.$this->cm->id); + } + if ($data = $mform->data_submitted()) { // No incoming data? if ($editable && $this->update_submission($data)) { //TODO fix log actions - needs db upgrade @@ -252,8 +256,10 @@ class assignment_online_edit_form extends moodleform { $mform->setType('id', PARAM_INT); // buttons - $buttonarray[] = &MoodleQuickForm::createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &MoodleQuickForm::createElement('reset', 'reset', get_string('revert')); + $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); + $buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert')); + $buttonarray[] =& $mform->createElement('cancel'); + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); } } diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 648b11d27d..1a3a75e74e 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -450,6 +450,10 @@ class assignment_upload extends assignment_base { $mform->set_defaults($defaults); + if ($mform->is_cancelled()) { + redirect('view.php?id='.$this->cm->id); + } + if (!$this->can_update_notes($submission)) { $this->view_header(get_string('upload')); notify(get_string('uploaderror', 'assignment')); @@ -925,8 +929,10 @@ class assignment_upload_notes_form extends moodleform { $mform->setType('id', PARAM_ALPHA); // buttons - $buttonarray[] = &MoodleQuickForm::createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &MoodleQuickForm::createElement('reset', 'reset', get_string('revert')); + $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); + $buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert')); + $buttonarray[] =& $mform->createElement('cancel'); + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); } }