Merge branch 'MDL-64245-master-fix-1' of git://github.com/ryanwyllie/moodle

lang/en/message.php

@@ -46,7 +46,6 @@ $string['contactblocked'] = 'Contact blocked';
 $string['contactrequests'] = 'Contact requests';
 $string['contactrequestsent'] = 'Contact request sent';
 $string['contacts'] = 'Contacts';
-$string['conversationlastmessage'] = '{$a->sender}: {$a->message}';
 $string['decline'] = 'Decline';
 $string['defaultmessageoutputs'] = 'Default message outputs';
 $string['defaults'] = 'Defaults';
@@ -211,6 +210,7 @@ $string['seeall'] = 'See all';
 $string['selectmessagestodelete'] = 'Select messages to delete';
 $string['selectnotificationtoview'] = 'Select from the list of notifications on the side to view more details';
 $string['send'] = 'Send';
+$string['sender'] = '{$a}:';
 $string['sendingvia'] = 'Sending "{$a->provider}" via "{$a->processor}"';
 $string['sendingviawhen'] = 'Sending "{$a->provider}" via "{$a->processor}" when {$a->state}';
 $string['sendcontactrequest'] = 'Send contact request';
@@ -251,7 +251,6 @@ $string['viewunreadmessageswith'] = 'View unread messages with {$a}';
 $string['writeamessage'] = 'Write a message...';
 $string['wouldliketocontactyou'] = 'Would like to contact you';
 $string['you'] = 'You:';
-$string['yousender'] = 'You';
 $string['youhaveblockeduser'] = 'You have blocked this user in the past';
 $string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}';
 

message/amd/src/message_drawer_view_conversation.js

@@ -433,15 +433,24 @@ function(
             .then(function() {
                 if (messageCount < messageLimit) {
                     // We haven't got enough messages so let's load some more.
-                    return loadMessages(conversation.id, messageLimit, messageCount, newestFirst, []);
+                    return loadMessages(conversation.id, messageLimit, messageCount, newestFirst, [])
+                        .then(function(result) {
+                            // Give the list of messages to the next handler.
+                            return result.messages;
+                        });
                 } else {
                     // We've got enough messages. No need to load any more for now.
-                    var newState = StateManager.setLoadingMessages(newState, false);
-                    return render(newState);
+                    var newState = StateManager.setLoadingMessages(viewState, false);
+                    return render(newState)
+                        .then(function() {
+                            // Give the list of messages to the next handler.
+                            return conversation.messages;
+                        });
                 }
             })
             .then(function(messages) {
-                setMessagesOffset(messageCount + messageLimit);
+                // Update the offset to reflect the number of messages we've loaded.
+                setMessagesOffset(messages.length);
                 return messages;
             })
             .then(function() {

message/amd/src/message_drawer_view_overview_section.js

@@ -361,14 +361,21 @@ function(
      */
     var updateLastMessage = function(element, conversation) {
         var message = conversation.messages[conversation.messages.length - 1];
-        var youString = '';
+        var senderString = '';
+        var senderStringRequest;
+        if (message.fromLoggedInUser) {
+            senderStringRequest = {key: 'you', component: 'core_message'};
+        } else {
+            senderStringRequest = {key: 'sender', component: 'core_message', param: message.userFrom.fullname};
+        }
+
         var stringRequests = [
-            {key: 'yousender', component: 'core_message'},
+            senderStringRequest,
             {key: 'strftimetime24', component: 'core_langconfig'},
         ];
         return Str.get_strings(stringRequests)
             .then(function(strings) {
-                youString = strings[0];
+                senderString = strings[0];
                 return UserDate.get([{timestamp: message.timeCreated, format: strings[1]}]);
             })
             .then(function(dates) {
@@ -377,13 +384,15 @@ function(
             .then(function(dateString) {
                 element.find(SELECTORS.LAST_MESSAGE_DATE).text(dateString).removeClass('hidden');
 
+                // No need to show sender string for private conversations and where the last message didn't come from you.
+                if (!message.fromLoggedInUser &&
+                        conversation.type === MessageDrawerViewConversationContants.CONVERSATION_TYPES.PRIVATE) {
+                    senderString = '';
+                }
+
                 // Now load the last message.
-                return Str.get_string('conversationlastmessage', 'core_message', {
-                    sender: message.fromLoggedInUser ? youString : message.userFrom.fullname,
-                    message: "<span class='text-muted'>" + $(message.text).text() + "</span>"
-                });
-            })
-            .then(function(lastMessage) {
+                var lastMessage = senderString + " <span class='text-muted'>" + $(message.text).text() + "</span>";
+
                 return element.find(SELECTORS.LAST_MESSAGE).html(lastMessage);
             });
     };

message/templates/message_drawer_conversations_list.mustache

@@ -67,30 +67,14 @@
             {{/subname}}
             <p class="m-0 font-weight-light text-truncate last-message" data-region="last-message">
                 {{#sentfromcurrentuser}}
-                    {{#str}}
-                        conversationlastmessage,
-                        core_message,
-                        {
-                            "sender": "{{#str}} yousender, core_message {{/str}}",
-                            "message": "<span class='text-muted'>{{lastmessage}}</span>"
-                        }
-                    {{/str}}
+                    {{#str}} you, core_message {{/str}}
                 {{/sentfromcurrentuser}}
                 {{^sentfromcurrentuser}}
                     {{#lastsendername}}
-                        {{#str}}
-                            conversationlastmessage,
-                            core_message,
-                            {
-                                "sender": "{{.}}",
-                                "message": "<span class='text-muted'>{{lastmessage}}</span>"
-                            }
-                        {{/str}}
-                    {{/lastsendername}}
-                    {{^lastsendername}}
-                        <span class='text-muted'>{{lastmessage}}</span>
+                        {{#str}} sender, core_message, {{.}} {{/str}}
                     {{/lastsendername}}
                 {{/sentfromcurrentuser}}
+                <span class='text-muted'>{{lastmessage}}</span>
             </p>
         </div>
         <div class="d-flex align-self-stretch">

message/templates/message_drawer_view_contacts_body.mustache

@@ -71,7 +71,7 @@
                 </li>
             </ul>
         </div>
-        <div class="tab-content d-flex flex-column">
+        <div class="tab-content d-flex flex-column h-100">
             {{< core_message/message_drawer_view_contacts_body_section_contacts }}
                 {{$rootclasses}}tab-pane fade show active h-100{{/rootclasses}}
                 {{$rootattributes}}

theme/bootstrapbase/templates/core_message/message_drawer_view_contacts_body.mustache

@@ -76,7 +76,7 @@
                 </li>
             </ul>
         </div>
-        <div class="tab-content d-flex flex-column">
+        <div class="tab-content d-flex flex-column h-100">
             {{< core_message/message_drawer_view_contacts_body_section_contacts }}
                 {{$rootclasses}}tab-pane fade in active h-100{{/rootclasses}}
                 {{$rootattributes}}