Fixed problem in random qtype (incorrect selection of state).

Fixed bug 3129. Randomsamatch now reports a propper error if not enogh SA questions are available.
moodle · May 17, 2005 · 16d85f5 · 16d85f5
1 parent 5a502b7
commit 16d85f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mod/quiz/questiontypes/random/questiontype.php b/mod/quiz/questiontypes/random/questiontype.php
@@ -104,7 +104,7 @@ function create_session_and_responses(&$question, &$state, $quiz, $attempt) {
     function restore_session_and_responses(&$question, &$state) {
         global $QUIZ_QTYPES;
         if(!$randomstate = get_record('quiz_states', 'question',
-         $question->id)) {
+         $question->id, 'attempt', $state->attempt)) {
             return false;
         }
 

diff --git a/mod/quiz/questiontypes/randomsamatch/questiontype.php b/mod/quiz/questiontypes/randomsamatch/questiontype.php
@@ -82,9 +82,12 @@ function create_session_and_responses(&$question, &$state, $quiz, $attempt) {
         $wanted = $question->options->choose;
         if ($count < $wanted && isteacherinanycourse()) {
             notify("Error: could not get enough Short-Answer questions!
-             Got $count Short-Answer questions, but wanted $wanted.
-             Reducing number to choose from to $count!");
-            $question->options->choose = $count;
+             This can happen if all available Short-Answer questions are already
+             taken up by other Random questions or Random Short-Answer question.
+             Another possible cause for this error is that Short-Answer
+             questions were deleted after this Random Short-Answer question was
+             created.");
+            return false;
         }
 
         $saquestions =