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

Merge branch 'MDL-38011-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2013-04-15 07:59:10 +01:00
parent 5ac9166740 3220058b14
commit 7af74e7f19
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
completion/criteria/completion_criteria_role.php
+4 -5
View File
@@ -59,7 +59,7 @@ class completion_criteria_role extends completion_criteria {
*/
public function config_form_display(&$mform, $data = null) {
$mform->addElement('checkbox', 'criteria_role['.$data->id.']', $data->name);
$mform->addElement('checkbox', 'criteria_role['.$data->id.']', $this->get_title($data));
if ($this->id) {
$mform->setDefault('criteria_role['.$data->id.']', 1);
@@ -122,8 +122,8 @@ class completion_criteria_role extends completion_criteria {
*/
public function get_title() {
global $DB;
$role = $DB->get_field('role', 'name', array('id' => $this->role));
return $role;
$role = $DB->get_record('role', array('id' => $this->role));
return role_get_name($role, context_course::instance($this->course));
}
/**
@@ -132,8 +132,7 @@ class completion_criteria_role extends completion_criteria {
* @return string
*/
public function get_title_detailed() {
global $DB;
return $DB->get_field('role', 'name', array('id' => $this->role));
return $this->get_title();
}
/**