mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26:37 +02:00
MDL-22033 groupings now enabled unconditionally, groupmembersonly kept as experimental - this simplifies groups code logic a bit, user interface changes should not be significant because the groupings are not visible much until at least one created; hopefully the new description of groupmembersonly will have to preventsome gradebook complaints
This commit is contained in:
parent
e8c2189d78
commit
98da60215e
31 changed files with 137 additions and 214 deletions
|
@ -87,11 +87,7 @@
|
|||
}
|
||||
|
||||
if (!isset($restore_groups)) {
|
||||
if (empty($CFG->enablegroupings)) {
|
||||
$restore_groups = RESTORE_GROUPS_ONLY;
|
||||
} else {
|
||||
$restore_groups = RESTORE_GROUPS_GROUPINGS;
|
||||
}
|
||||
$restore_groups = RESTORE_GROUPS_GROUPINGS;
|
||||
}
|
||||
|
||||
if (!isset($restore_logs)) {
|
||||
|
@ -466,15 +462,10 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
|
|||
$helplink = $OUTPUT->help_icon('grouprestore', get_string('groups'));
|
||||
echo '<label for="menurestore_groups">'.get_string ("groups").'</label>'.$helplink;
|
||||
echo "</b></td><td colspan=\"2\">";
|
||||
if (empty($CFG->enablegroupings)) {
|
||||
$group_options[RESTORE_GROUPS_NONE] = get_string('no');
|
||||
$group_options[RESTORE_GROUPS_ONLY] = get_string('yes');
|
||||
} else {
|
||||
$group_options[RESTORE_GROUPS_NONE] = get_string('none');
|
||||
$group_options[RESTORE_GROUPS_ONLY] = get_string('groupsonly', 'group');
|
||||
$group_options[RESTORE_GROUPINGS_ONLY] = get_string('groupingsonly', 'group');
|
||||
$group_options[RESTORE_GROUPS_GROUPINGS] = get_string('groupsgroupings', 'group'); //all.
|
||||
}
|
||||
$group_options[RESTORE_GROUPS_NONE] = get_string('none');
|
||||
$group_options[RESTORE_GROUPS_ONLY] = get_string('groupsonly', 'group');
|
||||
$group_options[RESTORE_GROUPINGS_ONLY] = get_string('groupingsonly', 'group');
|
||||
$group_options[RESTORE_GROUPS_GROUPINGS] = get_string('groupsgroupings', 'group'); //all.
|
||||
echo html_writer::select($group_options, 'restore_groups', $restore_groups, false);
|
||||
echo "</td></tr>";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue