mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48700-master' of git://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-01-05 13:30:55 +08:00
commit ba5b6abe0e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grade/report/history/classes/output/tablelog.php
View File

@ -467,7 +467,11 @@ class tablelog extends \table_sql implements \renderable {
list($sql, $params) = $this->get_sql_and_params();
$total = $DB->count_records_sql($countsql, $countparams);
$this->pagesize($pagesize, $total);
$histories = $DB->get_records_sql($sql, $params, $this->pagesize * $this->page, $this->pagesize);
if ($this->is_downloading()) {
$histories = $DB->get_records_sql($sql, $params);
} else {
$histories = $DB->get_records_sql($sql, $params, $this->pagesize * $this->page, $this->pagesize);
}
foreach ($histories as $history) {
$this->rawdata[] = $history;
}

1
grade/report/history/index.php
View File

@ -96,6 +96,7 @@ $mform->set_data($filters);
if ($table->is_downloading()) {
// Download file and exit.
\core\session\manager::write_close();
echo $output->render($table);
die();
}