L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-35375: Ensure the assignment grading table is always sorted by at least one unique column

Browse Source 
Conflicts:

	mod/assign/gradingtable.php
This commit is contained in:
Damyon Wiese
2012-09-24 12:38:24 +08:00
parent daccc92d9e
commit b666bddae2
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tablelib.php
+7 -3
View File
@@ -451,9 +451,13 @@ class flexible_table {
$this->sess->sortby = array_slice($this->sess->sortby, 0, $this->maxsortkeys);
}
// If we didn't sort just now, then use the default sort order if one is defined and the column exists
if (empty($this->sess->sortby) && !empty($this->sort_default_column)) {
$this->sess->sortby = array ($this->sort_default_column => ($this->sort_default_order == SORT_DESC ? SORT_DESC : SORT_ASC));
// MDL-35375 - If a default order is defined and it is not in the current list of order by columns, add it at the end.
// This prevents results from being returned in a random order if the only order by column contains equal values.
if (!empty($this->sort_default_column)) {
if (!array_key_exists($this->sort_default_column, $this->sess->sortby)) {
$defaultsort = array($this->sort_default_column => $this->sort_default_order);
$this->sess->sortby = array_merge($this->sess->sortby, $defaultsort);
}
}
$ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW);