mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-64099 message: Add sender name to conversation preview in overview

Browse Source
This commit is contained in:
Bas Brands 2018-11-22 12:09:42 +01:00 committed by Ryan Wyllie
parent 302586a5bc
commit 71b13a84a4
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/amd/build/message_drawer_view_overview_section.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
message/amd/src/message_drawer_view_overview_section.js
View File

@ -160,7 +160,9 @@ function(
*/
var render = function(contentContainer, conversations, userId) {
var formattedConversations = conversations.map(function(conversation) {
var lastMessage = conversation.messages.length ? conversation.messages[conversation.messages.length - 1] : null;
var formattedConversation = {
id: conversation.id,
imageurl: conversation.imageurl,
@ -186,6 +188,15 @@ function(
formattedConversation.isblocked = otherUser.isblocked;
}
if (conversation.type == MessageDrawerViewConversationContants.CONVERSATION_TYPES.PUBLIC) {
formattedConversation.lastsendername = conversation.members.reduce(function(carry, member) {
if (!carry && member.id == lastMessage.useridfrom) {
carry = member.fullname;
}
return carry;
}, null) + ':';
}
return formattedConversation;
});
@ -368,6 +379,8 @@ function(
if (message.fromLoggedInUser) {
lastMessage = youString + ' ' + lastMessage;
} else {
lastMessage = message.userFrom.fullname + ': ' + lastMessage;
}
element.find(SELECTORS.LAST_MESSAGE).html(lastMessage);

3
message/templates/message_drawer_conversations_list.mustache
View File

@ -75,7 +75,8 @@
{{/subname}}
<p class="m-0 font-weight-light text-truncate" data-region="last-message">
{{#sentfromcurrentuser}}{{#str}} you, core_message {{/str}}{{/sentfromcurrentuser}}
{{lastmessage}}
{{^sentfromcurrentuser}}{{lastsendername}}{{/sentfromcurrentuser}}
<span class="text-muted">{{lastmessage}}</span>
</p>
</div>

4
theme/bootstrapbase/less/moodle/bs4-compat.less
View File

@ -630,7 +630,9 @@
width: 24px !important;
}
}
.text-muted {
.muted;
}
.dir-rtl {
.dir-rtl-hide {
display: none;

3
theme/bootstrapbase/style/moodle.css
View File

@ -22337,6 +22337,9 @@ ul.indented-list {
height: 24px !important;
width: 24px !important;
}
.text-muted {
color: #999;
}
.dir-rtl .dir-rtl-hide {
display: none;
}