From 199286b29552e8d5af97f2cfd962e40afa5c0473 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Mon, 29 Dec 2014 10:59:23 -0500 Subject: [PATCH] Fix filter by skill with DRH role - refs BT#9084 --- main/inc/lib/skill.lib.php | 6 +----- plugin/advancedskills/report.php | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index fe9aa49533..9203074b8c 100755 --- a/main/inc/lib/skill.lib.php +++ b/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)) { diff --git a/plugin/advancedskills/report.php b/plugin/advancedskills/report.php index 78089fe34a..21e6166a62 100644 --- a/plugin/advancedskills/report.php +++ b/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; }