Merge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign

This commit is contained in:
Dan Poltawski 2012-11-13 13:04:14 +08:00
commit 47e126569d

View File

@ -317,6 +317,22 @@ class assign_grading_table extends table_sql implements renderable {
} }
} }
/**
* Before adding each row to the table make sure rownum is incremented
*
* @param array $row row of data from db used to make one row of the table.
* @return array one row for the table
*/
function format_row($row) {
if ($this->rownum < 0) {
$this->rownum = $this->currpage * $this->pagesize;
} else {
$this->rownum += 1;
}
return parent::format_row($row);
}
/** /**
* Add a column with an ID that uniquely identifies this user in this assignment * Add a column with an ID that uniquely identifies this user in this assignment
* *
@ -491,7 +507,7 @@ class assign_grading_table extends table_sql implements renderable {
/** /**
* Format a user picture for display (and update rownum as a sideeffect) * Format a user picture for display
* *
* @param stdClass $row * @param stdClass $row
* @return string * @return string
@ -686,11 +702,6 @@ class assign_grading_table extends table_sql implements renderable {
*/ */
function col_userid(stdClass $row) { function col_userid(stdClass $row) {
$edit = ''; $edit = '';
if ($this->rownum < 0) {
$this->rownum = $this->currpage * $this->pagesize;
} else {
$this->rownum += 1;
}
$actions = array(); $actions = array();