Merge branch 'MDL-38412' of git://github.com/timhunt/moodle

moodle · Mar 19, 2013 · bf2d2aa · bf2d2aa
2 parents 4e37889 + a4768fe
commit bf2d2aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/mod/quiz/report/attemptsreport_options.php b/mod/quiz/report/attemptsreport_options.php
@@ -113,12 +113,16 @@ public function __construct($mode, $quiz, $cm, $course) {
      * @return array URL parameter name => value.
      */
     protected function get_url_params() {
-        return array(
+        $params = array(
             'id'         => $this->cm->id,
             'mode'       => $this->mode,
             'attempts'   => $this->attempts,
             'onlygraded' => $this->onlygraded,
         );
+        if (groups_get_activity_groupmode($this->cm, $this->course)) {
+            $params['group'] = $this->group;
+        }
+        return $params;
     }
 
     /**

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
@@ -69,7 +69,7 @@ public function display($quiz, $cm, $course) {
         $courseshortname = format_string($course->shortname, true,
                 array('context' => context_course::instance($course->id)));
         $table = new quiz_overview_table($quiz, $this->context, $this->qmsubselect,
-                $options, $groupstudents, $students, $questions, $this->get_base_url());
+                $options, $groupstudents, $students, $questions, $options->get_url());
         $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'),
                 $courseshortname, $quiz->name);
         $table->is_downloading($options->download, $filename,

diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
@@ -77,7 +77,7 @@ public function display($quiz, $cm, $course) {
         $courseshortname = format_string($course->shortname, true,
                 array('context' => context_course::instance($course->id)));
         $table = new quiz_responses_table($quiz, $this->context, $this->qmsubselect,
-                $options, $groupstudents, $students, $questions, $this->get_base_url());
+                $options, $groupstudents, $students, $questions, $options->get_url());
         $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'),
                 $courseshortname, $quiz->name);
         $table->is_downloading($options->download, $filename,