MDL-25998 fix default manual enrol role

This commit is contained in:
Petr Skoda 2011-02-13 13:58:18 +01:00
parent d911c72bf9
commit d07f2def92

View file

@ -632,12 +632,14 @@ class course_enrolment_users_table extends course_enrolment_table {
$instances = $this->manager->get_enrolment_instances(); $instances = $this->manager->get_enrolment_instances();
$plugins = $this->manager->get_enrolment_plugins(); $plugins = $this->manager->get_enrolment_plugins();
$manuals = array();
// print enrol link or selection // print enrol link or selection
$links = array(); $links = array();
foreach($instances as $instance) { foreach($instances as $instance) {
$plugin = $plugins[$instance->enrol]; $plugin = $plugins[$instance->enrol];
if ($link = $plugin->get_manual_enrol_link($instance)) { if ($link = $plugin->get_manual_enrol_link($instance)) {
$links[$instance->id] = $link; $links[$instance->id] = $link;
$manuals[$instance->id] = $instance;
} }
} }
if (!empty($links)) { if (!empty($links)) {
@ -671,6 +673,7 @@ class course_enrolment_users_table extends course_enrolment_table {
$startdateoptions[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ; $startdateoptions[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
if ($count == 1) { if ($count == 1) {
$instance = reset($manuals);
$page->requires->strings_for_js(array( $page->requires->strings_for_js(array(
'ajaxoneuserfound', 'ajaxoneuserfound',
'ajaxxusersfound', 'ajaxxusersfound',
@ -697,7 +700,7 @@ class course_enrolment_users_table extends course_enrolment_table {
'ajaxurl'=>'/enrol/ajax.php', 'ajaxurl'=>'/enrol/ajax.php',
'url'=>$url->out(false), 'url'=>$url->out(false),
'optionsStartDate'=>$startdateoptions, 'optionsStartDate'=>$startdateoptions,
'defaultRole'=>get_config('enrol_manual', 'roleid')); 'defaultRole'=>$instance->roleid);
$page->requires->yui_module($modules, $function, array($arguments)); $page->requires->yui_module($modules, $function, array($arguments));
} }
return $control; return $control;