MDL-22309 report_singleview: Fixing wrong uses of get_role_users()

roddle · Nov 24, 2014 · 34f1842 · 34f1842
1 parent a8e60d9
commit 34f1842
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/grade/report/singleview/classes/local/screen/grade.php b/grade/report/singleview/classes/local/screen/grade.php
@@ -123,9 +123,13 @@ public function original_definition() {
     public function init($selfitemisempty = false) {
         $roleids = explode(',', get_config('moodle', 'gradebookroles'));
 
-        $this->items = get_role_users(
-            $roleids, $this->context, false, '',
-            'u.lastname, u.firstname', null, $this->groupid);
+        $this->items = array();
+        foreach ($roleids as $roleid) {
+            // Keeping the first user appearance.
+            $this->items = $this->items + get_role_users(
+                $roleid, $this->context, false, '',
+                'u.lastname, u.firstname', null, $this->groupid);
+        }
 
         $this->totalitemcount = count_role_users($roleids, $this->context);
 

diff --git a/grade/report/singleview/classes/local/screen/select.php b/grade/report/singleview/classes/local/screen/select.php
@@ -48,11 +48,15 @@ public function init($selfitemisempty = false) {
 
         $roleids = explode(',', get_config('moodle', 'gradebookroles'));
 
-        $this->items = get_role_users(
-            $roleids, $this->context, false, '',
-            'u.id, u.lastname, u.firstname', null, $this->groupid,
-            $this->perpage * $this->page, $this->perpage
-        );
+        $this->items = array();
+        foreach ($roleids as $roleid) {
+            // Keeping the first user appearance.
+            $this->items = $this->items + get_role_users(
+                $roleid, $this->context, false, '',
+                'u.id, u.lastname, u.firstname', null, $this->groupid,
+                $this->perpage * $this->page, $this->perpage
+            );
+        }
         $this->item = $DB->get_record('course', array('id' => $this->courseid));
     }