MDL-11576 New grade_item method has_hidden_grades(), which returns a simple count...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index a68bc33cf6c2d8ec253b799759c101e20bc30849..21bb72a64d0546eb7e90bac2e7b163a0af56a987 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -859,9 +859,11 @@ class grade_report_grader extends grade_report {
             $avghtml = '<tr class="' . $avgcssclass . ' r'.$this->rowcount++.'"><th class="header c0" scope="row">'.$straverage.'</th>';
 
             $columncount=1;
+
             foreach ($this->items as $item) {
                 // If the user shouldn't see this grade_item, hide the average as well
-                if ($item->is_hidden() && !$canviewhidden) {
+                // MDL-11576 If any of the grades are hidden and the user doesn't have permission to view them, hide average as well
+                if (($item->is_hidden() || $item->has_hidden_grades()) && !$canviewhidden) {
                     $avghtml .= '<td class="cell c' . $columncount++.'"> - </td>';
                     continue;
                 }

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index c3e4b464314738765551bd96e34c3b4d1498d484..a6387b29bd2682f07229b2bfb2fb37cdc6b552cc 100644 (file)
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -564,6 +564,14 @@ class grade_item extends grade_object {
             }
         }
     }
+    
+    /**
+     * Returns the number of grades that are hidden.
+     * @param return int Number of hidden grades
+     */
+    function has_hidden_grades() {
+        return count_records('grade_grades', 'itemid', $this->id, 'hidden', 1);
+    }
 
     /**
      * Mark regrading as finished successfully.