mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-18 06:58:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-63973 core_badges: exclude related badges when adding related badges

Browse Source 
The form which allows a user to add related badges should exclude any
related badges, regardless of the direction of the relationship.
This commit is contained in:
Jake Dallimore 2018-11-19 11:19:12 +08:00
parent c660772600
commit 810da68e14
1 changed files with 6 additions and 3 deletions

9
badges/related_form.php

@ -82,9 +82,12 @@ class edit_relatedbadge_form extends moodleform {
$sql = "SELECT b.id, b.name, b.version, b.language, b.type
FROM {badge} b
WHERE b.id <> :badgeid
AND b.id NOT IN (SELECT br.relatedbadgeid
FROM {badge_related} br WHERE br.badgeid = :badgeid1)";
$params = array('badgeid' => $badge->id, 'badgeid1' => $badge->id);
AND b.id NOT IN (
SELECT DISTINCT b.id
FROM {badge_related} br
JOIN {badge} b ON (br.relatedbadgeid = b.id OR br.badgeid = b.id)
WHERE (br.badgeid = :badgeid2 OR br.relatedbadgeid = :badgeid3) AND b.id != :badgeid4)";
$params = ['badgeid' => $badge->id, 'badgeid2' => $badge->id, 'badgeid3' => $badge->id, 'badgeid4' => $badge->id];
if ($badge->type == BADGE_TYPE_COURSE) {
$sql .= " AND (b.courseid = :courseid OR b.type = :badgetype)";
$params['courseid'] = $badge->courseid;