mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64043-master' of git://github.com/ryanwyllie/moodle

Browse Source
This commit is contained in:
Sara Arjona 2019-01-09 17:55:34 +01:00
commit c2fc318d4e
2 changed files with 7 additions and 6 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

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

@ -322,11 +322,10 @@ function(
* @return {Object} patch
*/
var buildHeaderPatchTypePublic = function(state, newState) {
var totalMemberCount = newState.totalMemberCount;
var oldMemberCount = state.totalMemberCount;
var newMemberCount = newState.totalMemberCount;
if (totalMemberCount === null) {
return null;
} else {
if (oldMemberCount != newMemberCount) {
return {
type: Constants.CONVERSATION_TYPES.PUBLIC,
showControls: true,
@ -334,13 +333,15 @@ function(
id: newState.id,
name: newState.name,
subname: newState.subname,
totalmembercount: totalMemberCount,
totalmembercount: newState.totalMemberCount,
imageurl: newState.imageUrl,
isfavourite: newState.isFavourite,
// Don't show favouriting if we don't have a conversation.
showfavourite: newState.id !== null
}
};
} else {
return null;
}
};