\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport * as Repository from 'core_user/repository';\nimport * as Str from 'core/str';\nimport ModalEvents from 'core/modal_events';\nimport ModalFactory from 'core/modal_factory';\nimport Notification from 'core/notification';\nimport Templates from 'core/templates';\nimport {add as notifyUser} from 'core/toast';\n\n/**\n * Show the add note popup\n *\n * @param {Number} courseid\n * @param {Number[]} users\n * @param {String[]} noteStateNames\n * @param {HTMLElement} stateHelpIcon\n * @return {Promise}\n */\nexport const showAddNote = (courseid, users, noteStateNames, stateHelpIcon) => {\n if (!users.length) {\n // No users were selected.\n return Promise.resolve();\n }\n\n const states = [];\n for (let key in noteStateNames) {\n switch (key) {\n case 'draft':\n states.push({value: 'personal', label: noteStateNames[key]});\n break;\n case 'public':\n states.push({value: 'course', label: noteStateNames[key], selected: 1});\n break;\n case 'site':\n states.push({value: key, label: noteStateNames[key]});\n break;\n }\n }\n\n const context = {\n stateNames: states,\n stateHelpIcon: stateHelpIcon.innerHTML,\n };\n\n let titlePromise = null;\n if (users.length === 1) {\n titlePromise = Str.get_string('addbulknotesingle', 'core_notes');\n } else {\n titlePromise = Str.get_string('addbulknote', 'core_notes', users.length);\n }\n\n return ModalFactory.create({\n type: ModalFactory.types.SAVE_CANCEL,\n body: Templates.render('core_user/add_bulk_note', context),\n title: titlePromise,\n buttons: {\n save: titlePromise,\n },\n removeOnClose: true,\n })\n .then(modal => {\n modal.getRoot().on(ModalEvents.save, () => submitAddNote(courseid, users, modal));\n\n modal.show();\n\n return modal;\n });\n};\n\n/**\n * Add a note to this list of users.\n *\n * @param {Number} courseid\n * @param {Number[]} users\n * @param {Modal} modal\n * @return {Promise}\n */\nconst submitAddNote = (courseid, users, modal) => {\n const text = modal.getRoot().find('form textarea').val();\n const publishstate = modal.getRoot().find('form select').val();\n\n const notes = users.map(userid => {\n return {\n userid,\n text,\n courseid,\n publishstate,\n };\n });\n\n return Repository.createNotesForUsers(notes)\n .then(noteIds => {\n if (noteIds.length === 1) {\n return Str.get_string('addbulknotedonesingle', 'core_notes');\n } else {\n return Str.get_string('addbulknotedone', 'core_notes', noteIds.length);\n }\n })\n .then(msg => notifyUser(msg))\n .catch(Notification.exception);\n};\n\n/**\n * Show the send message popup.\n *\n * @param {Number[]} users\n * @return {Promise}\n */\nexport const showSendMessage = users => {\n if (!users.length) {\n // Nothing to do.\n return Promise.resolve();\n }\n\n let titlePromise;\n if (users.length === 1) {\n titlePromise = Str.get_string('sendbulkmessagesingle', 'core_message');\n } else {\n titlePromise = Str.get_string('sendbulkmessage', 'core_message', users.length);\n }\n\n return ModalFactory.create({\n type: ModalFactory.types.SAVE_CANCEL,\n body: Templates.render('core_user/send_bulk_message', {}),\n title: titlePromise,\n buttons: {\n save: titlePromise,\n },\n removeOnClose: true,\n })\n .then(modal => {\n modal.getRoot().on(ModalEvents.save, (e) => {\n const text = modal.getRoot().find('form textarea').val();\n if (text.trim() === '') {\n modal.getRoot().find('[data-role=\"messagetextrequired\"]').removeAttr('hidden');\n e.preventDefault();\n return;\n }\n\n submitSendMessage(modal, users, text);\n });\n\n modal.show();\n\n return modal;\n });\n};\n\n/**\n * Send a message to these users.\n *\n * @param {Modal} modal\n * @param {Number[]} users\n * @param {String} text\n * @return {Promise}\n */\nconst submitSendMessage = (modal, users, text) => {\n const messages = users.map(touserid => {\n return {\n touserid,\n text,\n };\n });\n\n return Repository.sendMessagesToUsers(messages)\n .then(messageIds => {\n if (messageIds.length == 1) {\n return Str.get_string('sendbulkmessagesentsingle', 'core_message');\n } else {\n return Str.get_string('sendbulkmessagesent', 'core_message', messageIds.length);\n }\n })\n .then(msg => notifyUser(msg))\n .catch(Notification.exception);\n};\n"],"file":"bulkactions.min.js"}
\ No newline at end of file
diff --git a/user/amd/src/local/participants/bulkactions.js b/user/amd/src/local/participants/bulkactions.js
index 3872f71ef5a2c..aa792b32ac803 100644
--- a/user/amd/src/local/participants/bulkactions.js
+++ b/user/amd/src/local/participants/bulkactions.js
@@ -26,6 +26,7 @@ import * as Repository from 'core_user/repository';
import * as Str from 'core/str';
import ModalEvents from 'core/modal_events';
import ModalFactory from 'core/modal_factory';
+import Notification from 'core/notification';
import Templates from 'core/templates';
import {add as notifyUser} from 'core/toast';
@@ -151,8 +152,15 @@ export const showSendMessage = users => {
removeOnClose: true,
})
.then(modal => {
- modal.getRoot().on(ModalEvents.save, () => {
- submitSendMessage(modal, users);
+ modal.getRoot().on(ModalEvents.save, (e) => {
+ const text = modal.getRoot().find('form textarea').val();
+ if (text.trim() === '') {
+ modal.getRoot().find('[data-role="messagetextrequired"]').removeAttr('hidden');
+ e.preventDefault();
+ return;
+ }
+
+ submitSendMessage(modal, users, text);
});
modal.show();
@@ -166,11 +174,10 @@ export const showSendMessage = users => {
*
* @param {Modal} modal
* @param {Number[]} users
+ * @param {String} text
* @return {Promise}
*/
-const submitSendMessage = (modal, users) => {
- const text = modal.getRoot().find('form textarea').val();
-
+const submitSendMessage = (modal, users, text) => {
const messages = users.map(touserid => {
return {
touserid,
diff --git a/user/templates/send_bulk_message.mustache b/user/templates/send_bulk_message.mustache
index 34f9c91427ffc..a448116378b8f 100644
--- a/user/templates/send_bulk_message.mustache
+++ b/user/templates/send_bulk_message.mustache
@@ -33,6 +33,9 @@
+
+ {{#str}} messagetextrequired, core_message {{/str}}
+
{{#js}}
require(['core/auto_rows'], function(AutoRows) {
diff --git a/user/tests/behat/bulk_message.feature b/user/tests/behat/bulk_message.feature
index 266124ed13a86..067dea7a9fb67 100644
--- a/user/tests/behat/bulk_message.feature
+++ b/user/tests/behat/bulk_message.feature
@@ -25,8 +25,11 @@ Feature: Bulk message
And I navigate to course participants
And I click on "Select all" "checkbox"
And I set the field "With selected users..." to "Send a message"
- And I should see "Send message to 3 people"
+ And "Send message to 3 people" "dialogue" should exist
+ # Try to send an empty message.
+ When I press "Send message to 3 people"
+ Then I should see "Please enter message text"
And I set the following fields to these values:
| bulk-message | "Hello world!" |
- When I press "Send message to 3 people"
- Then I should see "Message sent to 3 people"
+ And I press "Send message to 3 people"
+ And I should see "Message sent to 3 people"