Merge branch 'MDL-66025' of git://github.com/paulholden/moodle

moodle · Mar 11, 2021 · baa9064 · baa9064
2 parents 98fa5b6 + 3112712
commit baa9064
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/lang/en/message.php b/lang/en/message.php
@@ -118,6 +118,7 @@
 $string['messagepreferences'] = 'Message preferences';
 $string['messages'] = 'Messages';
 $string['messagesselected:'] = 'Messages selected:';
+$string['messagetextrequired'] = 'Please enter message text';
 $string['messagingdatahasnotbeenmigrated'] = 'Your messages are temporarily unavailable due to upgrades in the messaging infrastructure. Please wait for them to be migrated.';
 $string['muteconversation'] = 'Mute';
 $string['mutedconversation'] = 'Muted conversation';

diff --git a/user/amd/build/local/participants/bulkactions.min.js b/user/amd/build/local/participants/bulkactions.min.js
diff --git a/user/amd/build/local/participants/bulkactions.min.js.map b/user/amd/build/local/participants/bulkactions.min.js.map
diff --git 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
@@ -33,6 +33,9 @@
 </label>
 <textarea id="bulk-message" rows="3" data-max-rows="10" data-auto-rows="true" cols="30" class="form-control"></textarea>
 </p>
+<div class="text-danger" data-role="messagetextrequired" hidden>
+    {{#str}} messagetextrequired, core_message {{/str}}
+</div>
 </form>
 {{#js}}
 require(['core/auto_rows'], function(AutoRows) {

diff --git 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"