summary refs log tree commit diff
path: root/webclient/room/room-controller.js
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-controller.js
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 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index fcd24c2749..48ddda62cc 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -161,6 +161,11 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
     var updateMemberList = function(chunk) {
         if (chunk.room_id != $scope.room_id) return;
 
+        // Ignore banned people
+        if ("ban" === chunk.membership) {
+            return;
+        }
+
         // set target_user_id to keep things clear
         var target_user_id = chunk.state_key;