From c9f73bd3258e40f5728a9910f9f5051240ca682e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 23 Sep 2014 16:11:12 +0100 Subject: [PATCH] fix one cause of SYWEB-53 --- webclient/components/matrix/matrix-filter.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js index 328e3a708..1a64dc126 100644 --- a/webclient/components/matrix/matrix-filter.js +++ b/webclient/components/matrix/matrix-filter.js @@ -49,15 +49,12 @@ angular.module('matrixFilter', []) if (member.state_key !== user_id) { if (member.state_key in $rootScope.presence) { - // If the user is available in presence, use the displayname there + // If the user is listed in presence, use the displayname there // as it is the most uptodate - roomName = $rootScope.presence[member.state_key].content.displayname; + roomName = $rootScope.presence[member.state_key].content.displayname || member.state_key; } - else if (member.content.displayname) { - roomName = member.content.displayname; - } - else { - roomName = member.state_key; + else { + roomName = member.content.displayname || member.state_key; } } }