Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2013-04-09 14:58:47 +08:00
commit ad84f8f9ac

View file

@ -157,10 +157,10 @@ class enrol_users_filter_form extends moodleform {
// names if applied. The reason for not restricting to roles that can
// be assigned at course level is that upper-level roles display in the
// enrolments table so it makes sense to let users filter by them.
$allroles = get_all_roles($manager->get_context());
$allroles = $manager->get_all_roles();
$rolenames = array();
foreach ($allroles as $id => $role) {
$rolenames[$id] = $role->name;
$rolenames[$id] = $role->localname;
}
$mform->addElement('select', 'role', get_string('role'),
array(0 => get_string('all')) + $rolenames);