MDL-39110 Administration: Get role from get_roles function to display as filter label

This commit is contained in:
Rajesh Taneja
2013-04-15 14:25:38 +08:00
parent b3661ab272
commit ff10ac5258
2 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -129,8 +129,8 @@ class user_filter_courserole extends user_filter_type {
$a->label = $this->_label;
if ($roleid) {
$rolename = $DB->get_field('role', 'name', array('id'=>$roleid));
$a->rolename = '"'.format_string($rolename).'"';
$role = $DB->get_record('role', array('id'=>$roleid));
$a->rolename = '"'.role_get_name($role).'"';
} else {
$a->rolename = get_string('anyrole', 'filters');
}
+3 -2
View File
@@ -78,11 +78,12 @@ class user_filter_globalrole extends user_filter_type {
function get_label($data) {
global $DB;
$rolename = $DB->get_field('role', 'name', array('id'=>$data['value']));
$role = $DB->get_record('role', array('id'=>$data['value']));
$a = new stdClass();
$a->label = $this->_label;
$a->value = '"'.format_string($rolename).'"';
$a->value = '"'.role_get_name($role).'"';
return get_string('globalrolelabel', 'filters', $a);
}