diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-10-24 16:14:47 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-10-24 16:14:47 +0100 |
| commit | 1342bcedaf1ddf0f45009e7f771f51ee0c32ca6f (patch) | |
| tree | 3288b0ba4adb7a2c359dff7b1257fe7db7368d9a /webclient/room | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-1342bcedaf1ddf0f45009e7f771f51ee0c32ca6f.tar.xz | |
switch from the deprecated msg.content.prev to msg.prev_content.membership, and fix the bug where kicks of unjoined users aren't displayed sensibly in the history
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index a3f8aee7ab..ce2c581903 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -91,11 +91,11 @@ <span ng-if="msg.user_id === msg.state_key"> {{ members[msg.state_key].displayname || msg.state_key }} left </span> - <span ng-if="msg.user_id !== msg.state_key"> + <span ng-if="msg.user_id !== msg.state_key && msg.prev_content"> {{ members[msg.user_id].displayname || msg.user_id }} - {{ {"join": "kicked", "ban": "unbanned"}[msg.content.prev] }} + {{ {"invite": "kicked", "join": "kicked", "ban": "unbanned"}[msg.prev_content.membership] }} {{ members[msg.state_key].displayname || msg.state_key }} - <span ng-if="'join' === msg.content.prev && msg.content.reason"> + <span ng-if="'join' === msg.prev_content.membership && msg.content.reason"> : {{ msg.content.reason }} </span> </span> @@ -105,7 +105,7 @@ {{ members[msg.user_id].displayname || msg.user_id }} {{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }} {{ members[msg.state_key].displayname || msg.state_key }} - <span ng-if="'ban' === msg.content.prev && msg.content.reason"> + <span ng-if="msg.prev_content && 'ban' === msg.prev_content.membership && msg.content.reason"> : {{ msg.content.reason }} </span> </span> |