moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-27869 Fix images in numerical and calculated questions.

Browse source 
Also fix an embarassing TODO in multianswer quetsions.
This commit is contained in:
Tim Hunt 2011-06-15 16:02:05 +01:00
parent c3f85e22d9
commit 03b2b8fa29
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
question/type/multianswer/question.php
View file

@ -245,6 +245,22 @@ class qtype_multianswer_question extends question_graded_automatically {
} }
public function check_file_access($qa, $options, $component, $filearea, $args, $forcedownload) { public function check_file_access($qa, $options, $component, $filearea, $args, $forcedownload) {
// TODO if ($component == 'question' && $filearea == 'answer') {
return true;
} else if ($component == 'question' && $filearea == 'answerfeedback') {
// Full logic to control which feedbacks a student can see is too complex.
// Just allow access to all images. There is a theoretical chance the
// students could see files they are not meant to see by guessing URLs,
// but it is remote.
return $options->feedback;
} else if ($component == 'question' && $filearea == 'hint') {
return $this->check_hint_file_access($qa, $options, $args);
} else {
return parent::check_file_access($qa, $options, $component, $filearea,
$args, $forcedownload);
}
} }
} }

4
question/type/numerical/question.php
View file

@ -240,8 +240,8 @@ class qtype_numerical_question extends question_graded_automatically {
$this->apply_unit_penalty($ans->fraction, $unit))); $this->apply_unit_penalty($ans->fraction, $unit)));
} }
public function check_file_access($question, $state, $options, $contextid, $component, public function check_file_access($qa, $options, $component, $filearea, $args,
$filearea, $args) { $forcedownload) {
if ($component == 'question' && $filearea == 'answerfeedback') { if ($component == 'question' && $filearea == 'answerfeedback') {
$currentanswer = $qa->get_last_qt_var('answer'); $currentanswer = $qa->get_last_qt_var('answer');
$answer = $qa->get_question()->get_matching_answer(array('answer' => $currentanswer)); $answer = $qa->get_question()->get_matching_answer(array('answer' => $currentanswer));