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

MDL-49573 gradereport_singleview: Fixed bulk insert override logic.

Browse Source
This commit is contained in:
Dave Cooper
2015-04-16 13:01:15 +08:00
parent fb3b04cb03
commit bd1537b64c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/singleview/classes/local/screen/grade.php
+6 -2
View File
@@ -343,8 +343,12 @@ class grade extends tablelike implements selectable_items, filterable_items {
}
foreach ($data as $varname => $value) {
if (preg_match('/override_(\d+)_(\d+)/', $varname, $matches)) {
$data->$matches[0] = '1';
if (preg_match('/^oldoverride_(\d+)_(\d+)/', $varname, $matches)) {
// If we've selected override or overriding all grades.
if (!empty($data->$matches[0]) || $filter == 'all') {
$override = "override_{$matches[1]}_{$matches[2]}";
$data->$override = '1';
}
}
if (!preg_match('/^finalgrade_(\d+)_/', $varname, $matches)) {
continue;
grade/report/singleview/classes/local/screen/user.php
+10 -2
View File
@@ -352,6 +352,10 @@ class user extends tablelike implements selectable_items {
continue;
}
$oldfinalgradefield = "oldfinalgrade_{$gradeitem->id}_{$this->itemid}";
if (!empty($data->$oldfinalgradefield)) {
continue;
}
$grade = grade_grade::fetch(array(
'itemid' => $this->itemid,
'userid' => $userid
@@ -369,8 +373,12 @@ class user extends tablelike implements selectable_items {
}
foreach ($data as $varname => $value) {
if (preg_match('/override_(\d+)_(\d+)/', $varname, $matches)) {
$data->$matches[0] = '1';
if (preg_match('/^oldoverride_(\d+)_(\d+)/', $varname, $matches)) {
// If we've selected override or overriding all grades.
if (!empty($data->$matches[0]) || $filter == 'all') {
$override = "override_{$matches[1]}_{$matches[2]}";
$data->$override = '1';
}
}
if (!preg_match('/^finalgrade_(\d+)_(\d+)/', $varname, $matches)) {
continue;