diff --git a/user/index.php b/user/index.php index a4f9648..3cadd33 100644 --- a/user/index.php +++ b/user/index.php @@ -261,12 +261,20 @@ if ($bulkoperations) { $pluginoptions = []; foreach ($bulkoperations as $key => $bulkoperation) { - $params = ['plugin' => $plugin->get_name(), 'operation' => $key]; + $params = ['plugin' => $plugin->get_name(), 'instance' => $instance->id, 'operation' => $key]; $url = new moodle_url('bulkchange.php', $params); $pluginoptions[$url->out(false)] = $bulkoperation->get_title(); } if (!empty($pluginoptions)) { - $name = get_string('pluginname', 'enrol_' . $plugin->get_name()); + $name = ''; + if (method_exists($plugin, 'get_instance_name')) { + $name = $plugin->get_instance_name($instance); + } else if (isset($instance->name) && !empty($instance->name)) { + $name = ' ' . format_string($instance->name); + } + if (empty($name)) { + $name = get_string('pluginname', 'enrol_' . $plugin->get_name()); + } $displaylist[] = [$name => $pluginoptions]; } } diff --git a/user/action_redir.php b/user/action_redir.php index 7459d4b..195dade 100644 --- a/user/action_redir.php +++ b/user/action_redir.php @@ -52,6 +52,7 @@ if ($formaction == 'bulkchange.php') { $url = new moodle_url($formaction); // Get the enrolment plugin type and bulk action from the url. $plugin = $url->param('plugin'); + $instanceid = $url->param('instance'); $operationname = $url->param('operation'); $dataformat = $url->param('dataformat'); @@ -120,7 +121,7 @@ if ($formaction == 'bulkchange.php') { $instances = enrol_get_instances($course->id, false); $instance = false; foreach ($instances as $oneinstance) { - if ($oneinstance->enrol == $plugin) { + if (($oneinstance->enrol == $plugin) && ($oneinstance->id == $instanceid)) { $instance = $oneinstance; break; }