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

Merge branch 'MDL-59822-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2017-08-29 15:25:33 +08:00
parent 6d2ff19051 ca56095250
commit b83a329ad6
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/classes/participants_table.php
+1 -1
View File
@@ -198,7 +198,7 @@ class participants_table extends \table_sql {
}
$canreviewenrol = has_capability('moodle/course:enrolreview', $context);
if ($canreviewenrol) {
if ($canreviewenrol && $courseid != SITEID) {
$columns[] = 'status';
$headers[] = get_string('participationstatus', 'enrol');
$this->no_sorting('status');
user/index.php
+14 -12
View File
@@ -263,19 +263,21 @@ if ($bulkoperations) {
$displaylist['groupaddnote.php'] = get_string('groupaddnewnote', 'notes');
}
$plugins = $manager->get_enrolment_plugins();
foreach ($plugins as $plugin) {
$bulkoperations = $plugin->get_bulk_operations($manager);
if ($context->id != $frontpagectx->id) {
$plugins = $manager->get_enrolment_plugins();
foreach ($plugins as $plugin) {
$bulkoperations = $plugin->get_bulk_operations($manager);
$pluginoptions = [];
foreach ($bulkoperations as $key => $bulkoperation) {
$params = ['plugin' => $plugin->get_name(), '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());
$displaylist[] = [$name => $pluginoptions];
$pluginoptions = [];
foreach ($bulkoperations as $key => $bulkoperation) {
$params = ['plugin' => $plugin->get_name(), '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());
$displaylist[] = [$name => $pluginoptions];
}
}
}