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

Merge branch 'MDL-79714-master' of https://github.com/meirzamoodle/moodle

Browse Source
This commit is contained in:
Huong Nguyen
2023-11-16 10:55:22 +07:00
parent 4cf3f384c3 3ee7968552
commit 3aa5c60399
17 changed files with 167 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/dataprivacy/db/messages.php
+1
View File
@@ -45,6 +45,7 @@ $messageproviders = [
// Notify Data Protection Officer about exceptions.
'notifyexceptions' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'tool/dataprivacy:managedatarequests'
admin/tool/messageinbound/db/messages.php
+18 -3
View File
@@ -24,11 +24,26 @@
$messageproviders = array (
// Invalid recipient handler.
'invalidrecipienthandler' => array(),
'invalidrecipienthandler' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// A generic message processing error.
'messageprocessingerror' => array(),
'messageprocessingerror' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// A generic message processing success message.
'messageprocessingsuccess' => array(),
'messageprocessingsuccess' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
admin/tool/monitor/db/messages.php
+4
View File
@@ -27,6 +27,10 @@ defined('MOODLE_INTERNAL') || die();
$messageproviders = array (
// Notify a user that a rule has happened.
'notification' => array (
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'tool/monitor:subscribe'
)
);
admin/tool/monitor/tests/behat/subscription.feature
-8
View File
@@ -102,10 +102,6 @@ Feature: tool_monitor_subscriptions
Scenario: Receiving notification on site level
Given I log in as "admin"
And I follow "Preferences" in the user menu
And I click on "Notification preferences" "link" in the "#page-content" "css_element"
And I click on "//td[@data-processor-name='popup']//div[@class='preference-state']" "xpath_element" in the "Notifications of rule subscriptions" "table_row"
And I wait until the page is ready
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Acceptance test site"
And I follow "Subscribe to rule \"New rule site level\""
@@ -123,10 +119,6 @@ Feature: tool_monitor_subscriptions
Scenario: Receiving notification on course level
Given I log in as "teacher1"
And I follow "Preferences" in the user menu
And I click on "Notification preferences" "link" in the "#page-content" "css_element"
And I click on "//td[@data-processor-name='popup']//div[@class='preference-state']" "xpath_element" in the "Notifications of rule subscriptions" "table_row"
And I wait until the page is ready
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I follow "Subscribe to rule \"New rule course level\""
enrol/flatfile/db/messages.php
+6 -1
View File
@@ -25,5 +25,10 @@
defined('MOODLE_INTERNAL') || die();
$messageproviders = array(
'flatfile_enrolment' => array(),
'flatfile_enrolment' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
enrol/imsenterprise/db/messages.php
+6 -1
View File
@@ -25,5 +25,10 @@
defined('MOODLE_INTERNAL') || die();
$messageproviders = array(
'imsenterprise_enrolment' => array(),
'imsenterprise_enrolment' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
enrol/manual/db/messages.php
+6 -1
View File
@@ -24,6 +24,11 @@
$messageproviders = array (
'expiry_notification' => array(),
'expiry_notification' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
enrol/paypal/db/messages.php
+6 -1
View File
@@ -25,5 +25,10 @@
defined('MOODLE_INTERNAL') || die();
$messageproviders = array(
'paypal_enrolment' => array(),
'paypal_enrolment' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
enrol/self/db/messages.php
+6 -1
View File
@@ -24,6 +24,11 @@
$messageproviders = array (
'expiry_notification' => array(),
'expiry_notification' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
lib/db/messages.php
+61 -22
View File
@@ -36,29 +36,38 @@ defined('MOODLE_INTERNAL') || die();
$messageproviders = array (
'newlogin' => array (
'defaults' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
),
],
),
// Notices that an admin might be interested in
// Notices that an admin might be interested in.
'notices' => array (
'capability' => 'moodle/site:config'
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:config',
),
// Important errors that an admin ought to know about
// Important errors that an admin ought to know about.
'errors' => array (
'capability' => 'moodle/site:config'
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:config',
),
// cron-based notifications about available moodle and/or additional plugin updates
// Cron-based notifications about available moodle and/or additional plugin updates.
'availableupdate' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:config',
'defaults' => array(
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED
),
),
'instantmessage' => array (
@@ -69,33 +78,47 @@ $messageproviders = array (
),
'backup' => array (
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:config'
),
// Course creation request notification
'courserequested' => array (
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:approvecourse'
),
// Course request approval notification
// Course request approval notification.
'courserequestapproved' => array (
'capability' => 'moodle/course:request',
'defaults' => array(
'capability' => 'moodle/course:request',
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
),
],
),
// Course request rejection notification
// Course request rejection notification.
'courserequestrejected' => array (
'capability' => 'moodle/course:request',
'defaults' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
),
],
),
// Course completed. Requires course completion configured at course level. It does not work with just activity progress.
'coursecompleted' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
@@ -121,16 +144,27 @@ $messageproviders = array (
// Badge award notification to a badge creator (mostly cron-based).
'badgecreatornotice' => array (
'defaults' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
)
],
),
// A comment was left on a plan.
'competencyplancomment' => array(),
'competencyplancomment' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// A comment was left on a user competency.
'competencyusercompcomment' => array(),
'competencyusercompcomment' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// User insights.
'insights' => array (
@@ -168,12 +202,17 @@ $messageproviders = array (
// Infected files.
'infected' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
'capability' => 'moodle/site:config',
),
// Report builder schedules.
'reportbuilderschedule' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_FORCED,
],
],
mod/assign/db/messages.php
+6 -2
View File
@@ -25,7 +25,11 @@
$messageproviders = array (
// Ordinary assignment submissions.
'assign_notification' => array(
)
'assign_notification' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
mod/assign/tests/behat/submission_notifications.feature
+3
View File
@@ -9,6 +9,9 @@ Feature: Manage assignment submission web notifications
| username | firstname | lastname | email |
| student1 | Student | 1 | student1@example.com |
| teacher1 | Teacher | 1 | teacher1@example.com |
And the following "user preferences" exist:
| user | preference | value |
| teacher1 | message_provider_mod_assign_assign_notification_enabled | none |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
mod/bigbluebuttonbn/db/messages.php
+4
View File
@@ -28,12 +28,16 @@ $messageproviders = [
// Recording ready notification posts.
'recording_ready' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// The instance was created or updated.
'instance_updated' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
];
mod/feedback/db/messages.php
+14 -6
View File
@@ -24,11 +24,19 @@
$messageproviders = array (
/// Submitting a feedback
'submission' => array (
),
/// Message to nonrespondents
'message' => array (
)
// Submitting a feedback.
'submission' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// Message to nonrespondents.
'message' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
mod/forum/db/messages.php
+10 -4
View File
@@ -26,12 +26,18 @@
$messageproviders = array (
// Ordinary single forum posts.
'posts' => array(
'defaults' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
),
],
),
// Forum digest messages.
'digests' => array(
),
'digests' => [
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
);
mod/lesson/db/messages.php
+5 -3
View File
@@ -25,11 +25,13 @@
$messageproviders = array (
// essay graded notification
// Essay graded notification.
'graded_essay' => array (
'defaults' => array(
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
),
],
)
);
mod/quiz/db/messages.php
+11 -1
View File
@@ -27,13 +27,19 @@ defined('MOODLE_INTERNAL') || die();
$messageproviders = [
// Notify teacher that a student has submitted a quiz attempt.
'submission' => [
'capability' => 'mod/quiz:emailnotifysubmission'
'capability' => 'mod/quiz:emailnotifysubmission',
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
// Confirm a student's quiz attempt.
'confirmation' => [
'capability' => 'mod/quiz:emailconfirmsubmission',
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
@@ -43,6 +49,8 @@ $messageproviders = [
'attempt_overdue' => [
'capability' => 'mod/quiz:emailwarnoverdue',
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],
@@ -50,6 +58,8 @@ $messageproviders = [
'attempt_grading_complete' => [
'capability' => 'mod/quiz:emailnotifyattemptgraded',
'defaults' => [
'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
],
],