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

Merge branch 'MDL-39790_master' of git://github.com/totara/openbadges into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2013-06-05 01:45:28 +02:00
parent 0f51a82bae 626c84bca9
commit ef8a1c4908
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/badges/block_badges.php
+11 -3
View File
@@ -52,7 +52,7 @@ class block_badges extends block_base {
return array(
'admin' => false,
'site-index' => true,
'course-view' => false,
'course-view' => true,
'mod' => false,
'my' => true
);
@@ -88,8 +88,16 @@ class block_badges extends block_base {
if (empty($CFG->enablebadges)) {
$this->content->text .= get_string('badgesdisabled', 'badges');
} else if ($badges = badges_get_user_badges($USER->id, null, 0, $this->config->numberofbadges)) {
$output = $PAGE->get_renderer('core', 'badges');
return $this->content;
}
$courseid = $this->page->course->id;
if ($courseid == SITEID) {
$courseid = null;
}
if ($badges = badges_get_user_badges($USER->id, $courseid, 0, $this->config->numberofbadges)) {
$output = $this->page->get_renderer('core', 'badges');
$this->content->text = $output->print_badges_list($badges, $USER->id, true);
} else {
$this->content->text .= get_string('nothingtodisplay', 'block_badges');