mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-58454 badges: Fix related badge deletion

Browse Source 
* When deleting a badge, delete badge_related records where this badge
is also set as the related badge.
This commit is contained in:
Jun Pataleta 2018-11-06 11:44:58 +08:00
parent 5a1ea82835
commit 9639cb487e
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
badges/tests/badgeslib_test.php
View File

@ -203,6 +203,45 @@ class core_badges_badgeslib_testcase extends advanced_testcase {
$this->assertAttributeEquals(BADGE_STATUS_ARCHIVED, 'status', $badge);
}
/**
* Really delete the badge.
*/
public function test_delete_badge_for_real() {
global $DB;
$badge = new badge($this->badgeid);
$newid1 = $badge->make_clone();
$newid2 = $badge->make_clone();
$newid3 = $badge->make_clone();
// Insert related badges to badge 1.
$badge->add_related_badges([$newid1, $newid2, $newid3]);
// Another badge.
$badge2 = new badge($newid2);
// Make badge 1 related for badge 2.
$badge2->add_related_badges([$this->badgeid]);
// Confirm that the records about this badge about its relations have been removed as well.
$relatedsql = 'badgeid = :badgeid OR relatedbadgeid = :relatedbadgeid';
$relatedparams = array(
'badgeid' => $this->badgeid,
'relatedbadgeid' => $this->badgeid
);
// Badge 1 has 4 related records. 3 where it's the badgeid, 1 where it's the relatedbadgeid.
$this->assertEquals(4, $DB->count_records_select('badge_related', $relatedsql, $relatedparams));
// Delete the badge for real.
$badge->delete(false);
// Confirm that the badge itself has been removed.
$this->assertFalse($DB->record_exists('badge', ['id' => $this->badgeid]));
// Confirm that the records about this badge about its relations have been removed as well.
$this->assertFalse($DB->record_exists_select('badge_related', $relatedsql, $relatedparams));
}
public function test_create_badge_criteria() {
$badge = new badge($this->badgeid);
$criteria_overall = award_criteria::build(array('criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id));

7
lib/badgeslib.php
View File

@ -716,7 +716,12 @@ class badge {
// Delete endorsements, competencies and related badges.
$DB->delete_records('badge_endorsement', array('badgeid' => $this->id));
$DB->delete_records('badge_related', array('badgeid' => $this->id));
$relatedsql = 'badgeid = :badgeid OR relatedbadgeid = :relatedbadgeid';
$relatedparams = array(
'badgeid' => $this->id,
'relatedbadgeid' => $this->id
);
$DB->delete_records_select('badge_related', $relatedsql, $relatedparams);
$DB->delete_records('badge_competencies', array('badgeid' => $this->id));
// Finally, remove badge itself.