From 32db0d42c9c2096d89902e7a631c849eabb1b983 Mon Sep 17 00:00:00 2001 From: skodak Date: Fri, 12 Jan 2007 19:01:31 +0000 Subject: [PATCH] MDL-8166 some forgotten set_defaults converted to set_data --- course/import/activities/import_form.php | 4 ++-- course/import/groups/import_form.php | 2 +- course/moodleform_mod.php | 4 ++-- mod/forum/post_form.php | 2 +- question/type/calculated/edit_calculated_form.php | 4 ++-- question/type/edit_question_form.php | 6 +++--- question/type/essay/edit_essay_form.php | 4 ++-- question/type/match/edit_match_form.php | 4 ++-- question/type/multianswer/edit_multianswer_form.php | 2 +- question/type/multichoice/edit_multichoice_form.php | 4 ++-- question/type/numerical/edit_numerical_form.php | 4 ++-- question/type/random/edit_random_form.php | 4 ++-- question/type/randomsamatch/edit_randomsamatch_form.php | 4 ++-- question/type/shortanswer/edit_shortanswer_form.php | 4 ++-- question/type/truefalse/edit_truefalse_form.php | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/course/import/activities/import_form.php b/course/import/activities/import_form.php index 3a6d0779f7..4d0075413a 100755 --- a/course/import/activities/import_form.php +++ b/course/import/activities/import_form.php @@ -12,7 +12,7 @@ class course_import_activities_form_1 extends moodleform { $options = $this->_customdata['options']; $courseid = $this->_customdata['courseid']; $mform->addElement('header', 'general', '');//fill in the data depending on page params - //later using set_defaults + //later using set_data $mform->addElement('select', 'fromcourse', $text, $options); // buttons @@ -40,7 +40,7 @@ class course_import_activities_form_2 extends moodleform { $courseid = $this->_customdata['courseid']; $mform->addElement('header', 'general', '');//fill in the data depending on page params - //later using set_defaults + //later using set_data $mform->addElement('text', 'fromcoursesearch', get_string('searchcourses')); // buttons diff --git a/course/import/groups/import_form.php b/course/import/groups/import_form.php index 8391f7fd2e..4c327dc183 100755 --- a/course/import/groups/import_form.php +++ b/course/import/groups/import_form.php @@ -15,7 +15,7 @@ class course_import_groups_form extends moodleform { //$this->set_max_file_size('', $maxuploadsize); $mform->addElement('header', 'general', '');//fill in the data depending on page params - //later using set_defaults + //later using set_data // buttons $mform->addElement('hidden', 'sesskey'); diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php index 27ae6204b6..f0176f657e 100644 --- a/course/moodleform_mod.php +++ b/course/moodleform_mod.php @@ -51,12 +51,12 @@ class moodleform_mod extends moodleform { * * @param mixed $default_values object or array of default values */ - function set_defaults($default_values) { + function set_data($default_values) { if (is_object($default_values)) { $default_values = (array)$default_values; } $this->defaults_preprocessing($default_values); - parent::set_defaults($default_values + $this->standard_coursemodule_elements_settings());//never slashed for moodleform_mod + parent::set_data($default_values + $this->standard_coursemodule_elements_settings());//never slashed for moodleform_mod } /** * Adds all the standard elements to a form to edit the settings for an activity module. diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php index 519d71a872..503c712099 100644 --- a/mod/forum/post_form.php +++ b/mod/forum/post_form.php @@ -20,7 +20,7 @@ class mod_forum_post_form extends moodleform { $this->set_upload_manager(new upload_manager('attachment', true, false, $course, false, $forum->maxbytes, true, true)); $mform->addElement('header', 'general', '');//fill in the data depending on page params - //later using set_defaults + //later using set_data $mform->addElement('text', 'subject', get_string('subject', 'forum'), 'size="64"'); $mform->setType('subject', PARAM_TEXT); $mform->addRule('subject', get_string('required'), 'required', null, 'client'); diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php index e698271235..693c4cb6f5 100644 --- a/question/type/calculated/edit_calculated_form.php +++ b/question/type/calculated/edit_calculated_form.php @@ -124,7 +124,7 @@ class question_edit_calculated_form extends question_edit_form { } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $answers = $question->options->answers; if (count($answers)) { @@ -156,7 +156,7 @@ class question_edit_calculated_form extends question_edit_form { $question = (object)((array)$question + $default_values); } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/edit_question_form.php b/question/type/edit_question_form.php index 610695ad60..b02b322bca 100644 --- a/question/type/edit_question_form.php +++ b/question/type/edit_question_form.php @@ -18,7 +18,7 @@ class question_edit_form extends moodleform { /** * Question object with options and answers already loaded by get_question_options * Be careful how you use this it is needed sometimes to set up the structure of the - * form in definition_inner but data is always loaded into the form with set_defaults. + * form in definition_inner but data is always loaded into the form with set_data. * * @var object */ @@ -127,13 +127,13 @@ class question_edit_form extends moodleform { // By default, do nothing. } - function set_defaults($question) { + function set_data($question) { global $QTYPES; $QTYPES[$question->qtype]->set_default_options($question); if (empty($question->image)){ unset($question->image); } - parent::set_defaults($question); + parent::set_data($question); } /** diff --git a/question/type/essay/edit_essay_form.php b/question/type/essay/edit_essay_form.php index d99cb82c29..dcb6381a2d 100644 --- a/question/type/essay/edit_essay_form.php +++ b/question/type/essay/edit_essay_form.php @@ -24,11 +24,11 @@ class question_edit_essay_form extends question_edit_form { $mform->addElement('hidden', 'fraction', 0); } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $question->feedback = $question->options->answer->feedback; } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/match/edit_match_form.php b/question/type/match/edit_match_form.php index 3684075d85..9fc4a5f288 100644 --- a/question/type/match/edit_match_form.php +++ b/question/type/match/edit_match_form.php @@ -45,7 +45,7 @@ class question_edit_match_form extends question_edit_form { } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $subquestions = $question->options->subquestions; if (count($subquestions)) { @@ -59,7 +59,7 @@ class question_edit_match_form extends question_edit_form { $default_values['shuffleanswers'] = $question->options->shuffleanswers; $question = (object)((array)$question + $default_values); } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/multianswer/edit_multianswer_form.php b/question/type/multianswer/edit_multianswer_form.php index 2afa18ba92..79aa7d2c2a 100644 --- a/question/type/multianswer/edit_multianswer_form.php +++ b/question/type/multianswer/edit_multianswer_form.php @@ -15,7 +15,7 @@ class question_edit_multianswer_form extends question_edit_form { // No question-type specific form fields. - function set_defaults($question) { + function set_data($question) { if ($question->questiontext and $question->id and $question->qtype) { foreach ($question->options->questions as $key => $wrapped) { diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php index b11790e698..8b22f0dbdf 100644 --- a/question/type/multichoice/edit_multichoice_form.php +++ b/question/type/multichoice/edit_multichoice_form.php @@ -62,7 +62,7 @@ class question_edit_multichoice_form extends question_edit_form { } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $answers = $question->options->answers; if (count($answers)) { @@ -81,7 +81,7 @@ class question_edit_multichoice_form extends question_edit_form { $default_values['incorrectfeedback'] = $question->options->incorrectfeedback; $question = (object)((array)$question + $default_values); } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/numerical/edit_numerical_form.php b/question/type/numerical/edit_numerical_form.php index 25c8196ed6..a40acf349c 100644 --- a/question/type/numerical/edit_numerical_form.php +++ b/question/type/numerical/edit_numerical_form.php @@ -74,7 +74,7 @@ class question_edit_numerical_form extends question_edit_form { $firstunit->setPersistantFreeze(true); } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $answers = $question->options->answers; if (count($answers)) { @@ -102,7 +102,7 @@ class question_edit_numerical_form extends question_edit_form { } $question = (object)((array)$question + $default_values); } - parent::set_defaults($question); + parent::set_data($question); } function validation($data){ $errors = array(); diff --git a/question/type/random/edit_random_form.php b/question/type/random/edit_random_form.php index 707957bde4..b33cec144d 100644 --- a/question/type/random/edit_random_form.php +++ b/question/type/random/edit_random_form.php @@ -64,11 +64,11 @@ class question_edit_random_form extends question_edit_form { $mform->closeHeaderBefore('buttonar'); } - function set_defaults($question) { + function set_data($question) { if (empty($question->name)) { $question->name = get_string("random", "quiz"); } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/randomsamatch/edit_randomsamatch_form.php b/question/type/randomsamatch/edit_randomsamatch_form.php index 98a0255af8..9504951fd5 100644 --- a/question/type/randomsamatch/edit_randomsamatch_form.php +++ b/question/type/randomsamatch/edit_randomsamatch_form.php @@ -31,7 +31,7 @@ class question_edit_randomsamatch_form extends question_edit_form { $mform->addElement('hidden', 'fraction', 0); } - function set_defaults($question) { + function set_data($question) { if (empty($question->name)) { $question->name = get_string("randomsamatch", "quiz"); } @@ -39,7 +39,7 @@ class question_edit_randomsamatch_form extends question_edit_form { if (empty($question->questiontext)) { $question->questiontext = get_string("randomsamatchintro", "quiz"); } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { diff --git a/question/type/shortanswer/edit_shortanswer_form.php b/question/type/shortanswer/edit_shortanswer_form.php index 6a3cb148cd..6122be6326 100644 --- a/question/type/shortanswer/edit_shortanswer_form.php +++ b/question/type/shortanswer/edit_shortanswer_form.php @@ -46,7 +46,7 @@ class question_edit_shortanswer_form extends question_edit_form { } - function set_defaults($question) { + function set_data($question) { if (isset($question->options)){ $answers = $question->options->answers; if (count($answers)) { @@ -61,7 +61,7 @@ class question_edit_shortanswer_form extends question_edit_form { $default_values['usecase'] = $question->options->usecase; $question = (object)((array)$question + $default_values); } - parent::set_defaults($question); + parent::set_data($question); } function validation($data){ $errors = array(); diff --git a/question/type/truefalse/edit_truefalse_form.php b/question/type/truefalse/edit_truefalse_form.php index ad1fe3a13e..c54909eaa6 100644 --- a/question/type/truefalse/edit_truefalse_form.php +++ b/question/type/truefalse/edit_truefalse_form.php @@ -29,14 +29,14 @@ class question_edit_truefalse_form extends question_edit_form { $mform->setType('feedbackfalse', PARAM_RAW); } - function set_defaults($question) { + function set_data($question) { if (!empty($question->options->trueanswer)) { $trueanswer = $question->options->answers[$question->options->trueanswer]; $question->correctanswer = ($trueanswer->fraction != 0); $question->feedbacktrue = $trueanswer->feedback; $question->feedbackfalse = $question->options->answers[$question->options->falseanswer]->feedback; } - parent::set_defaults($question); + parent::set_data($question); } function qtype() { -- 2.39.5