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

Merge branch 'MDL-63458_36' of https://github.com/rlorenzo/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2019-07-30 11:59:47 +08:00
parent e974568f89 029c0fdb85
commit b861e09e65
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/tests/behat/message_admin_settings.feature
+9
View File
@@ -8,6 +8,9 @@ Feature: Message admin settings
Given the following "users" exist:
| username | firstname | lastname | email |
| user1 | User | One | one@example.com |
And the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
Scenario: enable site messaging
Given the following config values are set as admin:
@@ -18,6 +21,9 @@ Feature: Message admin settings
And I should see "User One"
And I follow "User One"
And "Add to contacts" "link" should exist
And I am on "Course 1" course homepage
And I navigate to course participants
And the "With selected users..." select box should contain "Send a message"
Scenario: disable site messaging
Given the following config values are set as admin:
@@ -28,3 +34,6 @@ Feature: Message admin settings
And I should see "User One"
And I follow "User One"
And "Add to contacts" "link" should not exist
And I am on "Course 1" course homepage
And I navigate to course participants
And the "With selected users..." select box should not contain "Send a message"
user/index.php
+3 -1
View File
@@ -292,7 +292,9 @@ if ($bulkoperations) {
'value' => get_string('deselectall')));
echo html_writer::end_tag('div');
$displaylist = array();
$displaylist['#messageselect'] = get_string('messageselectadd');
if (!empty($CFG->messaging)) {
$displaylist['#messageselect'] = get_string('messageselectadd');
}
if (!empty($CFG->enablenotes) && has_capability('moodle/notes:manage', $context) && $context->id != $frontpagectx->id) {
$displaylist['#addgroupnote'] = get_string('addnewnote', 'notes');
}