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

Merge branch 'MDL-71610-master' of git://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Ilya Tregubov 2021-09-29 15:40:39 +02:00
commit 34a0ba3232
110 changed files with 769 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

5
user/profile.php
View file

@ -184,7 +184,10 @@ if ($PAGE->user_allowed_editing()) {
}
$url = new moodle_url("$CFG->wwwroot/user/profile.php", $params);
$button = $OUTPUT->single_button($url, $editstring);
$button = '';
if (!$PAGE->theme->haseditswitch) {
$button = $OUTPUT->single_button($url, $editstring);
}
$PAGE->set_button($resetbutton . $button);
} else {

2
user/tests/behat/add_blocks.feature
View file

@ -20,6 +20,6 @@ Feature: Add blocks to my profile page
And I follow "View profile"
Scenario: Add blocks to page
When I press "Customise this page"
When I turn editing mode on
And I add the "Latest announcements" block
Then I should see "Latest announcements"

2
user/tests/behat/custom_profile_fields.feature
View file

@ -260,7 +260,7 @@ Feature: Custom profile fields should be visible and editable by those with the
| moodle/user:editprofile | Allow | parent | User | userwithinformation |
Given I log in as "admin"
And I am on site homepage
And I navigate to "Turn editing on" in current page administration
And I turn editing mode on
And I add the "Mentees" block
And I log out
And I log in as "parent"

2
user/tests/behat/reset_page.feature
View file

@ -20,7 +20,7 @@ Feature: Reset my profile page to default
And I follow "View profile"
Scenario: Add blocks to page and reset
When I press "Customise this page"
When I turn editing mode on
And I add the "Latest announcements" block
And I press "Reset page to default"
Then I should not see "Latest announcements"

2
user/tests/behat/view_preferences_page.feature
View file

@ -54,7 +54,7 @@ Feature: Access to preferences page
Scenario: A user with the appropriate permissions can view another user's permissions page.
Given I log in as "admin"
And I am on site homepage
And I follow "Turn editing on"
And I turn editing mode on
And I add the "Mentees" block
And I navigate to "Users > Permissions > Define roles" in site administration
And I click on "Add a new role" "button"