mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-15540 Navigation panel did not work on the review page for multi-page quizzes because of the way states were loaded. Fix the regressions caused by the previous refactor.

Browse Source
This commit is contained in:
tjhunt 2008-09-04 07:05:14 +00:00
parent 4d5948f1ac
commit 40d1feeb49
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/questionlib.php
View File

@ -919,10 +919,8 @@ function question_preload_states($attemptid) {
foreach ($states as $questionid => $state) {
$states[$questionid]->_partiallyloaded = true;
if ($gradedstates[$questionid]) {
$gradedstates[$questionid]->_partiallyloaded = true;
$states[$questionid]->last_graded = $gradedstates[$questionid];
} else {
$states[$questionid]->last_graded = clone($states[$questionid]);
$states[$questionid]->last_graded->_partiallyloaded = true;
}
}
@ -935,13 +933,13 @@ function question_preload_states($attemptid) {
* is not a state in the database.
*
* @param array $questions the questions to load state for.
* @param array $states the partially loaded states.
* @param array $states the partially loaded states this array is updated.
* @param object $cmoptions options from the module we are loading the states for. E.g. $quiz.
* @param object $attempt The attempt for which the question sessions are
* to be restored or created.
* @param mixed either the id of a previous attempt, if this attmpt is
* building on a previous one, or false for a clean attempt.
* @return array the fully loaded states.
* @return true or false for success or failure.
*/
function question_load_states(&$questions, &$states, $cmoptions, $attempt, $lastattemptid = false) {
global $QTYPES, $DB;
@ -953,9 +951,13 @@ function question_load_states(&$questions, &$states, $cmoptions, $attempt, $last
if (isset($states[$qid]->_partiallyloaded)) {
unset($states[$qid]->_partiallyloaded);
}
if (isset($states[$qid]->lastgraded->_partiallyloaded)) {
restore_question_state($questions[$qid], $states[$qid]->lastgraded);
unset($states[$qid]->lastgraded->_partiallyloaded);
if (isset($states[$qid]->last_graded)) {
restore_question_state($questions[$qid], $states[$qid]->last_graded);
if (isset($states[$qid]->last_graded->_partiallyloaded)) {
unset($states[$qid]->last_graded->_partiallyloaded);
}
} else {
$states[$qid]->last_graded = clone($states[$qid]);
}
} else {
// If the new attempt is to be based on a previous attempt get it and clean things
@ -1027,7 +1029,7 @@ function question_load_states(&$questions, &$states, $cmoptions, $attempt, $last
$states[$qid]->last_graded = clone($states[$qid]);
}
}
return $states;
return true;
}
/**
@ -1054,9 +1056,6 @@ function question_load_states(&$questions, &$states, $cmoptions, $attempt, $last
* building on a previous one, or false for a clean attempt.
*/
function get_question_states(&$questions, $cmoptions, $attempt, $lastattemptid = false) {
// get the question ids
$ids = array_keys($questions);
// Preload the states.
$states = question_preload_states($attempt->uniqueid);
if (!$states) {
@ -1064,7 +1063,9 @@ function get_question_states(&$questions, $cmoptions, $attempt, $lastattemptid =
}
// Then finish the job.
question_load_states($questions, $states, $cmoptions, $attempt, $lastattemptid);
if (!question_load_states($questions, $states, $cmoptions, $attempt, $lastattemptid)) {
return false;
}
return $states;
}

2
mod/quiz/attemptlib.php
View File

@ -414,7 +414,7 @@ class quiz_attempt extends quiz {
$this->ensure_question_loaded($id);
$questionstoprocess[$id] = $this->questions[$id];
}
if (!$newstates = question_load_states($questionstoprocess, $this->states,
if (!question_load_states($questionstoprocess, $this->states,
$this->quiz, $this->attempt)) {
throw new moodle_quiz_exception($this, 'cannotrestore');
}