L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-63973-master' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2018-11-19 16:28:13 +08:00
parent 31cc108654 810da68e14
commit a356db0db2
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/renderer.php
+5 -3
View File
@@ -722,8 +722,10 @@ class core_badges_renderer extends plugin_renderer_base {
}
if (has_capability('moodle/badges:configuredetails', $context)) {
$related = $DB->count_records_sql("SELECT COUNT(br.badgeid)
FROM {badge_related} br WHERE br.badgeid = :badgeid", array('badgeid' => $badgeid));
$sql = "SELECT COUNT(br.badgeid)
FROM {badge_related} br
WHERE (br.badgeid = :badgeid OR br.relatedbadgeid = :badgeid2)";
$related = $DB->count_records_sql($sql, ['badgeid' => $badgeid, 'badgeid2' => $badgeid]);
$row[] = new tabobject('brelated',
new moodle_url('/badges/related.php', array('id' => $badgeid)),
get_string('brelated', 'badges', $related)
@@ -1502,4 +1504,4 @@ class badge_competencies_alignment implements renderable
$this->alignments = $alignments;
$this->currentbadgeid = $currentbadgeid;
}
}
}