summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-03 11:38:24 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-03 11:38:24 +0200
commit4ba5b4b55d67b4188d551916e0707f456a6af787 (patch)
tree8b9c528414f17a05a47e4f48a8bc2ccea206ad45 /webclient/room/room.html
parentPrefix API links with /docs/api/client-server so they should link through cor... (diff)
downloadsynapse-4ba5b4b55d67b4188d551916e0707f456a6af787.tar.xz
Do not show banned people in member list. Format ban events strings in room and recent flows
Diffstat (limited to '')
-rw-r--r--webclient/room/room.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html
index e672b1d7e2..05e87387a5 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -50,8 +50,9 @@
                     <div class="bubble">
                         <span ng-show='msg.type === "m.room.member"'>
                             {{ members[msg.user_id].displayname || msg.user_id }}
-                            {{ {"join": "joined", "leave": "left", "invite": "invited"}[msg.content.membership] }}
-                            {{ msg.content.membership === "invite" ? (msg.state_key || '') : '' }}
+                            {{ {"join": "joined", "leave": "left", "invite": "invited", "ban": "banned"}[msg.content.membership] }}
+                            {{ (msg.content.membership === "invite" || msg.content.membership === "ban") ? (msg.state_key || '') : '' }}
+
                         </span>
                         <span ng-show='msg.content.msgtype === "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/>
                         <span ng-show='msg.content.msgtype === "m.text"' ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/>