L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-65616 message: always notify user after sending contact request.

Browse Source
This commit is contained in:
Paul Holden
2021-03-15 18:56:44 +00:00
parent 295901e6a1
commit 29f4175b6f
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/amd/build/message_drawer_view_conversation_patcher.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/build/message_drawer_view_conversation_patcher.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/src/message_drawer_view_conversation_patcher.js
+2 -9
View File
@@ -1310,10 +1310,7 @@ function(
/**
* We should show the contact request sent message if the user just sent
* a contact request to the other user and there are no messages in the
* conversation.
*
* The messages should be hidden when there are messages in the conversation.
* a contact request to the other user
*
* @param {Object} state The current state.
* @param {Object} newState The new state.
@@ -1331,18 +1328,14 @@ function(
});
var oldRequest = oldSentRequests.length > 0;
var newRequest = newSentRequests.length > 0;
var hadMessages = state.messages.length > 0;
var hasMessages = state.messages.length > 0;
if (!oldRequest && newRequest && !newOtherUser.iscontact && !hasMessages) {
if (!oldRequest && newRequest && !newOtherUser.iscontact) {
return newOtherUser.fullname;
} else if (oldOtherUser && !oldOtherUser.iscontact && newRequest && newOtherUser.iscontact) {
// Contact request accepted.
return false;
} else if (oldRequest && !newRequest) {
return false;
} else if (!hadMessages && hasMessages) {
return false;
} else {
return null;
}