mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

MDL-65101 core_message: 'canmessage' should trump 'requirescontract'

Browse Source
This commit is contained in:
Mark Nelson 2019-06-18 15:18:01 +08:00
parent 7ec1804935
commit a9fd9c7909
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

7
message/amd/src/message_drawer_view_conversation_patcher.js
View File

@ -854,6 +854,11 @@ function(
* @return {Bool}
*/
var requiresContactRequest = function(loggedInUserId, user) {
// If a user can message then no contact request is required.
if (user.canmessage) {
return false;
}
var contactRequests = user.contactrequests.filter(function(request) {
return request.userid == loggedInUserId || request.requesteduserid;
});
@ -1036,7 +1041,7 @@ function(
type: 'add-contact',
user: otherUser
};
} else if (!otherUser.canmessage || (otherUser.requirescontact && !otherUser.iscontact)) {
} else if (!otherUser.canmessage && (otherUser.requirescontact && !otherUser.iscontact)) {
return {type: 'unable-to-message'};
}
}