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

This commit is contained in:
Eloy Lafuente (stronk7) 2018-11-15 11:04:12 +01:00
commit 7a9717f614
4 changed files with 39 additions and 3 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -160,6 +160,16 @@ function(
var getLoggedInUserProfile = function(body) {
return {
id: parseInt(body.attr('data-user-id'), 10),
fullname: null,
profileimageurl: null,
profileimageurlsmall: null,
isonline: null,
showonlinestatus: null,
isblocked: null,
iscontact: null,
isdeleted: null,
canmessage: null,
requirescontact: null,
contactrequests: []
};
};

View File

@ -76,6 +76,31 @@ define(['jquery'], function($) {
});
};
/**
* Format members to be used in a state.
*
* @param {Array} members The messages to format.
* @return {Array} Formatted members.
*/
var formatMembers = function(members) {
return members.map(function(member) {
return {
id: member.id,
fullname: member.fullname,
profileimageurl: member.profileimageurl,
profileimageurlsmall: member.profileimageurlsmall,
isonline: member.isonline,
showonlinestatus: member.showonlinestatus,
isblocked: member.isblocked,
iscontact: member.iscontact,
isdeleted: member.isdeleted,
canmessage: member.canmessage,
requirescontact: member.requirescontact,
contactrequests: member.contactrequests || []
};
});
};
/**
* Create an initial (blank) state.
*
@ -190,7 +215,8 @@ define(['jquery'], function($) {
*/
var addMembers = function(state, members) {
var newState = cloneState(state);
members.forEach(function(member) {
var formattedMembers = formatMembers(members);
formattedMembers.forEach(function(member) {
newState.members[member.id] = member;
});
return newState;