javascript MDL-26098 manual grading was not working when quiz_attempts.id and questio...

diff --git a/mod/quiz/comment.php b/mod/quiz/comment.php
index 66b1d94..ea8da3a 100644 (file)
--- a/mod/quiz/comment.php
+++ b/mod/quiz/comment.php
@@ -2,9 +2,11 @@
 /**
  * This page allows the teacher to enter a manual grade for a particular question.
  * This page is expected to only be used in a popup window.
- *  *
+ *
+ * @package mod
+ * @subpackage quiz
+ * @copyright gustav delius 2006
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package quiz
  */
 
     require_once('../../config.php');
@@ -61,7 +63,7 @@
     $attemptobj->question_print_comment_fields($questionid, 'response');
 ?>
 <div>
-    <input type="hidden" name="attempt" value="<?php echo $attemptobj->get_uniqueid(); ?>" />
+    <input type="hidden" name="attempt" value="<?php echo $attemptobj->get_attemptid(); ?>" />
     <input type="hidden" name="question" value="<?php echo $questionid; ?>" />
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 </div>

diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index c11641d..e085c18 100644 (file)
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -917,7 +917,7 @@ function quiz_get_reviewoptions($quiz, $attempt, $context) {
 
     // Show a link to the comment box only for closed attempts
     if ($attempt->timefinish && has_capability('mod/quiz:grade', $context)) {
-        $options->questioncommentlink = '/mod/quiz/comment.php';
+        $options->questioncommentlink = new moodle_url('/mod/quiz/comment.php', array('attempt' => $attempt->id));
     }
 
     // Whether to display a response history.

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 1b03478..11843cd 100644 (file)
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -957,7 +957,7 @@ class default_questiontype {
         if (!empty($options->questioncommentlink)) {
             $strcomment = get_string('commentorgrade', 'quiz');
 
-            $link = new moodle_url("$options->questioncommentlink?attempt=$state->attempt&question=$actualquestionid");
+            $link = new moodle_url($options->questioncommentlink, array('question' => $actualquestionid));
             $action = new popup_action('click', $link, 'commentquestion', array('height' => 480, 'width' => 750));
             $commentlink = $OUTPUT->container($OUTPUT->action_link($link, $strcomment, $action), 'commentlink');
         }