Skip to content
Snippets Groups Projects
Commit 9b1ca64a authored by Kegan Dougal's avatar Kegan Dougal
Browse files

Fix bug which prevented the number of users being visible on the recents view.

parent fd535183
No related branches found
No related tags found
No related merge requests found
......@@ -540,13 +540,12 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService
var room = modelService.getRoom(room_id);
memberCount = 0;
for (var i in room.current_room_state.members) {
if (!room.current_room_state.members.hasOwnProperty(i)) continue;
var member = room.current_room_state.members[i];
if ("join" === member.membership) {
if ("join" === member.content.membership) {
memberCount = memberCount + 1;
}
}
......
......@@ -31,8 +31,8 @@ angular.module('RecentsController')
// (ie, do not show it if he has been banned)
var member = modelService.getMember(room_id, user_id);
room.recent.me = member;
if (member && ("invite" === member.membership || "join" === member.membership)) {
if ("invite" === member.membership) {
if (member && ("invite" === member.content.membership || "join" === member.content.membership)) {
if ("invite" === member.content.membership) {
room.recent.inviter = member.user_id;
}
// Count users here
......
......@@ -9,7 +9,7 @@
{{ room.room_id | mRoomName }}
</td>
<td class="recentsRoomSummaryUsersCount">
<span ng-show="undefined !== room.numUsersInRoom">
<span ng-show="undefined !== room.recent.numUsersInRoom">
{{ room.recent.numUsersInRoom || '1' }} {{ room.recent.numUsersInRoom == 1 ? 'user' : 'users' }}
</span>
</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment