Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-38412_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
commit 7849c443762e6c2a62abdfdfe969d4ef4276f9ed 2 parents e2c7333 + 682b737
Eloy Lafuente (stronk7) authored March 19, 2013
6  mod/quiz/report/attemptsreport_options.php
@@ -113,12 +113,16 @@ public function __construct($mode, $quiz, $cm, $course) {
113 113
      * @return array URL parameter name => value.
114 114
      */
115 115
     protected function get_url_params() {
116  
-        return array(
  116
+        $params = array(
117 117
             'id'         => $this->cm->id,
118 118
             'mode'       => $this->mode,
119 119
             'attempts'   => $this->attempts,
120 120
             'onlygraded' => $this->onlygraded,
121 121
         );
  122
+        if (groups_get_activity_groupmode($this->cm, $this->course)) {
  123
+            $params['group'] = $this->group;
  124
+        }
  125
+        return $params;
122 126
     }
123 127
 
124 128
     /**
2  mod/quiz/report/overview/report.php
@@ -69,7 +69,7 @@ public function display($quiz, $cm, $course) {
69 69
         $courseshortname = format_string($course->shortname, true,
70 70
                 array('context' => context_course::instance($course->id)));
71 71
         $table = new quiz_overview_table($quiz, $this->context, $this->qmsubselect,
72  
-                $options, $groupstudents, $students, $questions, $this->get_base_url());
  72
+                $options, $groupstudents, $students, $questions, $options->get_url());
73 73
         $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'),
74 74
                 $courseshortname, $quiz->name);
75 75
         $table->is_downloading($options->download, $filename,
2  mod/quiz/report/responses/report.php
@@ -77,7 +77,7 @@ public function display($quiz, $cm, $course) {
77 77
         $courseshortname = format_string($course->shortname, true,
78 78
                 array('context' => context_course::instance($course->id)));
79 79
         $table = new quiz_responses_table($quiz, $this->context, $this->qmsubselect,
80  
-                $options, $groupstudents, $students, $questions, $this->get_base_url());
  80
+                $options, $groupstudents, $students, $questions, $options->get_url());
81 81
         $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'),
82 82
                 $courseshortname, $quiz->name);
83 83
         $table->is_downloading($options->download, $filename,

0 notes on commit 7849c44

Please sign in to comment.
Something went wrong with that request. Please try again.