added cancel button to glossary comment form and fixed initialization of button arrays MDL-7778
This commit is contained in:
@@ -47,6 +47,7 @@ class change_password_form extends moodleform {
|
||||
|
||||
// buttons
|
||||
if (empty($USER->preference['auth_forcepasswordchange'])) {
|
||||
$buttonarray = array();
|
||||
$buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges'));
|
||||
$buttonarray[] = &$mform->createElement('cancel');
|
||||
$mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
|
||||
|
||||
@@ -21,6 +21,7 @@ class forgot_password_form extends moodleform {
|
||||
$mform->setType('action', PARAM_ALPHA);
|
||||
|
||||
// buttons
|
||||
$buttonarray = array();
|
||||
$buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('ok'));
|
||||
$buttonarray[] = &$mform->createElement('cancel');
|
||||
$mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
|
||||
|
||||
@@ -50,6 +50,7 @@ class login_signup_form extends moodleform {
|
||||
$mform->setDefault('country', '');
|
||||
|
||||
// buttons
|
||||
$buttonarray = array();
|
||||
$buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('createaccount'));
|
||||
$buttonarray[] = &$mform->createElement('cancel');
|
||||
$mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
|
||||
|
||||
@@ -256,6 +256,7 @@ class assignment_online_edit_form extends moodleform {
|
||||
$mform->setType('id', PARAM_INT);
|
||||
|
||||
// buttons
|
||||
$buttonarray = array();
|
||||
$buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges'));
|
||||
$buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert'));
|
||||
$buttonarray[] =& $mform->createElement('cancel');
|
||||
|
||||
@@ -929,6 +929,7 @@ class assignment_upload_notes_form extends moodleform {
|
||||
$mform->setType('id', PARAM_ALPHA);
|
||||
|
||||
// buttons
|
||||
$buttonarray = array();
|
||||
$buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges'));
|
||||
$buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert'));
|
||||
$buttonarray[] =& $mform->createElement('cancel');
|
||||
|
||||
@@ -54,6 +54,10 @@ function glossary_comment_add() {
|
||||
$mform = new glossary_comment_form('comment.php');
|
||||
$mform->set_defaults(array('eid'=>$eid, 'action'=>'add'));
|
||||
|
||||
if ($mform->is_cancelled()) {
|
||||
redirect("comments.php?id=$cm->id&eid=$entry->id");
|
||||
}
|
||||
|
||||
if ($data = $mform->data_submitted()) {
|
||||
trusttext_after_edit($data->entrycomment, $context);
|
||||
|
||||
|
||||
@@ -25,9 +25,11 @@ class glossary_comment_form extends moodleform {
|
||||
$mform->setType('action', PARAM_ACTION);
|
||||
|
||||
// buttons
|
||||
$buttonarray=array();
|
||||
$buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges'));
|
||||
$buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
|
||||
$buttonarray = array();
|
||||
$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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user