Fixed SYWEB-28: show displayname changes in recents

This commit is contained in:
Emmanuel ROHEE 2014-09-24 12:48:24 +02:00
parent 6f5970a2e1
commit b02bb18a70

View File

@ -33,8 +33,10 @@
<div ng-hide="room.membership === 'invite'" ng-switch="lastMsg.type"> <div ng-hide="room.membership === 'invite'" ng-switch="lastMsg.type">
<div ng-switch-when="m.room.member"> <div ng-switch-when="m.room.member">
<span ng-switch="lastMsg.changedKey">
<span ng-switch-when="membership">
<span ng-if="'join' === lastMsg.content.membership"> <span ng-if="'join' === lastMsg.content.membership">
{{ lastMsg.state_key | mUserDisplayName: room.room_id}} joined {{ lastMsg.state_key | mUserDisplayName: room.room_id }} joined
</span> </span>
<span ng-if="'leave' === lastMsg.content.membership"> <span ng-if="'leave' === lastMsg.content.membership">
<span ng-if="lastMsg.user_id === lastMsg.state_key"> <span ng-if="lastMsg.user_id === lastMsg.state_key">
@ -57,6 +59,11 @@
: {{ lastMsg.content.reason }} : {{ lastMsg.content.reason }}
</span> </span>
</span> </span>
</span>
<span ng-switch-when="displayname">
{{ lastMsg.user_id }} changed their display name from {{ lastMsg.prev_content.displayname }} to {{ lastMsg.content.displayname }}
</span>
</span>
</div> </div>
<div ng-switch-when="m.room.message"> <div ng-switch-when="m.room.message">