MDL-9079 - Paging broken in quiz overview report. Merged from MOODLE_17_STABLE.
This commit is contained in:
@@ -109,6 +109,9 @@ class quiz_report extends quiz_default_report {
|
||||
$detailedmarks = optional_param('detailedmarks', 0, PARAM_INT);
|
||||
$pagesize = optional_param('pagesize', 10, PARAM_INT);
|
||||
$hasfeedback = quiz_has_feedback($quiz->id) && $quiz->grade > 1.e-7 && $quiz->sumgrades > 1.e-7;
|
||||
if ($pagesize < 1) {
|
||||
$pagesize = 10;
|
||||
}
|
||||
|
||||
// Now check if asked download of data
|
||||
if ($download) {
|
||||
@@ -166,7 +169,9 @@ class quiz_report extends quiz_default_report {
|
||||
|
||||
$table->define_columns($tablecolumns);
|
||||
$table->define_headers($tableheaders);
|
||||
$table->define_baseurl($CFG->wwwroot.'/mod/quiz/report.php?mode=overview&id='.$cm->id);
|
||||
$table->define_baseurl($CFG->wwwroot.'/mod/quiz/report.php?mode=overview&id=' .
|
||||
$cm->id . '&noattempts=' . $noattempts . '&detailedmarks=' . $detailedmarks .
|
||||
'&pagesize=' . $pagesize);
|
||||
|
||||
$table->sortable(true);
|
||||
$table->collapsible(true);
|
||||
@@ -407,10 +412,6 @@ class quiz_report extends quiz_default_report {
|
||||
$sort = ' ORDER BY uniqueid';
|
||||
}
|
||||
|
||||
// Now it is time to page the data
|
||||
if (!isset($pagesize) || ((int)$pagesize < 1) ) {
|
||||
$pagesize = 10;
|
||||
}
|
||||
$table->pagesize($pagesize, $total);
|
||||
}
|
||||
|
||||
@@ -587,7 +588,7 @@ class quiz_report extends quiz_default_report {
|
||||
}
|
||||
// Print display options
|
||||
echo '<div class="controls">';
|
||||
echo '<form id="options" action="report.php" method="post">';
|
||||
echo '<form id="options" action="report.php" method="get">';
|
||||
echo '<div>';
|
||||
echo '<p>'.get_string('displayoptions', 'quiz').': </p>';
|
||||
echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
|
||||
@@ -598,7 +599,7 @@ class quiz_report extends quiz_default_report {
|
||||
echo '<table id="overview-options" class="boxaligncenter">';
|
||||
echo '<tr align="left">';
|
||||
echo '<td><label for="pagesize">'.get_string('pagesize', 'quiz').'</label></td>';
|
||||
echo '<td><input type="text" id="pagesize" name="pagesize" size="1" value="'.$pagesize.'" /></td>';
|
||||
echo '<td><input type="text" id="pagesize" name="pagesize" size="3" value="'.$pagesize.'" /></td>';
|
||||
echo '</tr>';
|
||||
echo '<tr align="left">';
|
||||
echo '<td colspan="2">';
|
||||
|
||||
Reference in New Issue
Block a user