summary refs log tree commit diff
path: root/webclient/rooms
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-18 17:14:57 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-18 17:14:57 +0200
commitcebceb7b9d8050c8f50d2d1277caf03f0acf40ea (patch)
tree8102693a1fd12b33cc6d1516292293056ee7c01b /webclient/rooms
parentSupport room alias in rooms URL (ex: http://127.0.0.1:8000/#/room/#public:loc... (diff)
downloadsynapse-cebceb7b9d8050c8f50d2d1277caf03f0acf40ea.tar.xz
If possible, use href with room alias in rooms list
Diffstat (limited to 'webclient/rooms')
-rw-r--r--webclient/rooms/rooms.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html
index 007ad29999..2602209bd3 100644
--- a/webclient/rooms/rooms.html
+++ b/webclient/rooms/rooms.html
@@ -65,7 +65,7 @@
     
     <div class="rooms" ng-repeat="(rm_id, room) in rooms">
         <div>
-            <a href="#/room/{{ rm_id }}" >{{ room.room_alias }}</a> {{room.membership === 'invite' ? ' (invited)' : ''}}
+            <a href="#/room/{{ room.room_alias ? room.room_alias : rm_id }}" >{{ room.room_alias }}</a> {{room.membership === 'invite' ? ' (invited)' : ''}}
         </div>
     </div>
     <br/>
@@ -74,7 +74,7 @@
     
     <div class="public_rooms" ng-repeat="room in public_rooms">
         <div>
-            <a href="#/room/{{ room.room_id }}" >{{ room.room_alias }}</a>
+            <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" >{{ room.room_alias }}</a>
         </div>
     </div>
     <br/>