Fix filter by skill with DRH role - refs BT#9084

main/inc/lib/skill.lib.php

@@ -1117,7 +1117,7 @@ class Skill extends Model
      * @param int $skillId The skill id
      * @return array The users list
      */
-    public function listUsersWhoAchieved($skillId, $filterByUsers = array())
+    public function listUsersWhoAchieved($skillId)
     {
         $skillId = intval($skillId);
 
@@ -1138,10 +1138,6 @@ class Skill extends Model
             . "ON sru.skill_id = skill.id "
             . "WHERE skill.id = $skillId ";
 
-        if (!empty($filterByUsers)) {
-            $sql .= "AND user.user_id IN (" . implode(', ', $filterByUsers) . ")";
-        }
-
         $result = Database::query($sql);
 
         while ($row = Database::fetch_assoc($result)) {

plugin/advancedskills/report.php

@@ -135,13 +135,13 @@ if ($isStudent) {
                 $userId, STUDENT, false, false, false, null, null, null, null, null, null, DRH
             );
 
-            $usersFilter = array();
+            $coursesFilter = array();
 
-            foreach ($students as $student) {
-                $usersFilter[] = $student['user_id'];
+            foreach ($courses as $course) {
+                $coursesFilter[] = $course['id'];
             }
 
-            $tableRows = $objSkill->listUsersWhoAchieved($selectedSkill, $usersFilter);
+            $tableRows = $objSkill->listUsersWhoAchieved($selectedSkill, $coursesFilter);
 
             break;
     }