moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-78587' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Andrew Nicols 2023-07-13 08:48:06 +08:00 • committed by Sara Arjona
commit 5d1a115c64
No known key found for this signature in database
28 changed files with 88 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
enrol/cohort/tests/behat/enrolcohorts.feature
View file

@ -58,7 +58,7 @@ Feature: Cohort enrolment management
| Cohort | A1 |
| customint2 | -1 |
Then I should see "Cohort sync (Alpha1 - Student)"
And I select "Groups" from the "jump" singleselect
And I set the field "Participants tertiary navigation" to "Groups"
# Confirm that group was created and corresponding group members are present
And I set the field "groups[]" to "Alpha1 cohort (2)"
And the "members" select box should contain "Sandra Cole (s1@example.com)"
@ -106,7 +106,7 @@ Feature: Cohort enrolment management
And I click on "Edit" "link" in the "Beta2" "table_row"
And I set the field "Add to group" to "Create new group"
And I click on "Save changes" "button"
And I select "Groups" from the "jump" singleselect
And I set the field "Participants tertiary navigation" to "Groups"
And I set the field "groups[]" to "Beta2 cohort (2)"
Then the "members" select box should contain "Bianca McAfee (s3@example.com)"
And the "members" select box should contain "Abigail Wyatt (s5@example.com)"

1
enrol/instances.php
View file

@ -202,7 +202,6 @@ if ($canconfig and $action and confirm_sesskey()) {
echo $OUTPUT->header();
echo $OUTPUT->render_participants_tertiary_nav($course);
echo $OUTPUT->heading(get_string('enrolmentinstances', 'enrol'));
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');

1
enrol/renameroles.php
View file

@ -48,7 +48,6 @@ $PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->render_participants_tertiary_nav($course);
echo $OUTPUT->heading(get_string('rolerenaming'));
echo $OUTPUT->paragraph(get_string('rolerenaming_help'));