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

Merge branch 'MDL-51287-311' of https://github.com/SangNguyenAnh/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2021-02-08 11:29:08 +01:00
parent ee74321fa5 a7ac52538e
commit 82de03b116
8 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/calendar.php
+1 -1
View File
@@ -85,7 +85,7 @@ if ($calendarform->is_cancelled()) {
$USER->calendartype = $calendartype;
}
redirect($redirect);
redirect($redirect, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Display page header.
user/course.php
+1 -1
View File
@@ -44,7 +44,7 @@ if ($courseform->is_cancelled()) {
useredit_update_user_preference(['id' => $user->id,
'preference_usemodchooser' => $data->enableactivitychooser]);
redirect($redirect);
redirect($redirect, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Display page header.
user/edit.php
+1 -1
View File
@@ -299,7 +299,7 @@ if ($userform->is_cancelled()) {
}
if (!$emailchanged || !$CFG->emailchangeconfirmation) {
redirect($returnurl);
redirect($returnurl, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
}
user/editadvanced.php
+2 -2
View File
@@ -306,11 +306,11 @@ if ($userform->is_cancelled()) {
// Somebody double clicked when editing admin user during install.
redirect("$CFG->wwwroot/$CFG->admin/");
} else {
redirect($returnurl);
redirect($returnurl, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
} else {
\core\session\manager::gc(); // Remove stale sessions.
redirect("$CFG->wwwroot/$CFG->admin/user.php");
redirect("$CFG->wwwroot/$CFG->admin/user.php", get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Never reached..
}
user/editor.php
+1 -1
View File
@@ -52,7 +52,7 @@ if ($editorform->is_cancelled()) {
// Trigger event.
\core\event\user_updated::create_from_userid($user->id)->trigger();
redirect($redirect);
redirect($redirect, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Display page header.
user/forum.php
+1 -1
View File
@@ -72,7 +72,7 @@ if ($forumform->is_cancelled()) {
}
}
redirect($redirect);
redirect($redirect, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Display page header.
user/language.php
+1 -1
View File
@@ -60,7 +60,7 @@ if ($languageform->is_cancelled()) {
$USER->lang = $lang;
}
redirect($redirect);
redirect($redirect, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
}
// Display page header.
user/tests/behat/edit_profile_notification.feature
+58
View File
@@ -0,0 +1,58 @@
@core @core_user
Feature: Notification shown when user edit profile or preferences
In order to show notification
As a user
I press update profile button after make some changes in edit profile page
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| unicorn | Unicorn | 1 | unicorn@example.com |
And the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "course enrolments" exist:
| user | course | role |
| unicorn | C1 | student |
@javascript
Scenario: Change own profile and has notification shown
Given I log in as "unicorn"
And I follow "Profile" in the user menu
When I click on "Edit profile" "link" in the "region-main" "region"
And I should see "Unicorn"
And I should see "1"
Then I set the field "Surname" to "Lil"
And I click on "Update profile" "button"
And I should see "Changes saved"
And I click on ".close" "css_element" in the "div.alert-block" "css_element"
And I should not see "Changes saved"
And I follow "Preferences" in the user menu
And I follow "Preferred language"
And I click on "Save changes" "button"
And I should see "Changes saved"
And I follow "Forum preferences"
And I set the field "Use experimental nested discussion view" to "Yes"
And I click on "Save changes" "button"
And I should see "Changes saved"
@javascript
Scenario: Do not show notification when cancel profile change
Given I log in as "unicorn"
And I follow "Profile" in the user menu
When I click on "Edit profile" "link" in the "region-main" "region"
And I should see "Unicorn"
And I should see "1"
Then I set the field "Surname" to "Lil"
And I click on "Cancel" "button"
And I should not see "Changes saved"
@javascript
Scenario: Show notification after admin edited profile of another user
Given I log in as "admin"
And I navigate to "Users > Accounts > Browse list of users" in site administration
When I click on "Edit" "link" in the "Unicorn 1" "table_row"
And I expand all fieldsets
Then I set the field "Surname" to "Lil"
And I click on "Update profile" "button"
And I should see "Changes saved"