Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-33117_grade_display_23' of git://github.com/andyjda…
…vis/moodle into MOODLE_23_STABLE
  • Loading branch information
danpoltawski committed Oct 2, 2012
2 parents 54dd6ee + 60b6b62 commit 2cbbf5d
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions grade/report/user/lib.php
Expand Up @@ -228,6 +228,26 @@ function inject_rowspans(&$element) {
} }
$count = 1; $count = 1;
foreach ($element['children'] as $key=>$child) { 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]); $count += $this->inject_rowspans($element['children'][$key]);
} }
$element['rowspan'] = $count; $element['rowspan'] = $count;
Expand Down

0 comments on commit 2cbbf5d

Please sign in to comment.