Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-33117_grade_display_23' of git://github.com/andyjda…

…vis/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit 2cbbf5d8291109a0a5264081ae5b1c9cd35712cd 2 parents 54dd6ee + 60b6b62
@danpoltawski danpoltawski authored
Showing with 20 additions and 0 deletions.
  1. +20 −0 grade/report/user/lib.php
View
20 grade/report/user/lib.php
@@ -228,6 +228,26 @@ function inject_rowspans(&$element) {
}
$count = 1;
foreach ($element['children'] as $key=>$child) {
+
+ $grade_object = $child['object'];
+ // If grade object isn't hidden
+ if ($grade_object->hidden != 1) {
+
+ // If grade object is an module instance
+ if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) {
+
+ $instances = $this->gtree->modinfo->get_instances();
+ // If we can find the module instance
+ if (!empty($instances[$grade_object->itemmodule][$grade_object->iteminstance])) {
+
+ $cm = $instances[$grade_object->itemmodule][$grade_object->iteminstance];
+ // Skip generating rowspans if the user cannot see the module instance
+ if (!$cm->uservisible) {
+ continue;
+ }
+ }
+ }
+ }
$count += $this->inject_rowspans($element['children'][$key]);
}
$element['rowspan'] = $count;
Please sign in to comment.
Something went wrong with that request. Please try again.