Merge branch 'MDL-65132-master' of git://github.com/cescobedo/moodle

robjoyce · May 7, 2019 · 2daa199 · 2daa199
2 parents 83477ce + 37a653c
commit 2daa199
Show file tree

Hide file tree

Showing 19 changed files with 626 additions and 32 deletions.
diff --git a/lang/en/message.php b/lang/en/message.php
@@ -55,6 +55,8 @@
 $string['deleteallmessages'] = "Delete all messages";
 $string['deleteallselfconfirm'] = "Are you sure you would like to delete this entire personal conversation?";
 $string['deleteconversation'] = "Delete conversation";
+$string['deleteforeveryone'] = "Delete for me and everyone";
+$string['deleteforeveryoneselectedmessagesconfirm'] = 'Are you sure you would like to delete the selected messages?';
 $string['deleteselectedmessages'] = 'Delete selected messages';
 $string['deleteselectedmessagesconfirm'] = 'Are you sure you would like to delete the selected messages? This will not delete them for other conversation participants.';
 $string['deleteselectedmessagesconfirmselfconversation'] = 'Are you sure you would like to delete the selected personal messages?';

diff --git a/lib/db/services.php b/lib/db/services.php
@@ -1407,6 +1407,16 @@
         'ajax' => true,
         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
     ),
+    'core_message_delete_message_for_all_users' => array(
+        'classname' => 'core_message_external',
+        'methodname' => 'delete_message_for_all_users',
+        'classpath' => 'message/externallib.php',
+        'description' => 'Deletes a message for all users.',
+        'type' => 'write',
+        'capabilities' => 'moodle/site:deleteanymessage',
+        'ajax' => true,
+        'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
+    ),
     'core_notes_create_notes' => array(
         'classname' => 'core_notes_external',
         'methodname' => 'create_notes',

diff --git a/message/amd/build/message_drawer_view_conversation.min.js b/message/amd/build/message_drawer_view_conversation.min.js
diff --git a/message/amd/build/message_drawer_view_conversation_constants.min.js b/message/amd/build/message_drawer_view_conversation_constants.min.js