From 7371e68f55bedff5d88ed0bd504edaed5642a2f5 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Wed, 20 Aug 2014 17:46:16 +0200
Subject: [PATCH] Quick fix to support array of room aliases
---
webclient/rooms/rooms-controller.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js
index a237b59b4e..c25e24c8bc 100644
--- a/webclient/rooms/rooms-controller.js
+++ b/webclient/rooms/rooms-controller.js
@@ -71,9 +71,10 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
// use the existing alias from storage
data[i].room_alias = alias;
}
- else if (data[i].room_alias) {
+ else if (data[i].aliases && data[i].aliases[0]) {
// save the mapping
- matrixService.createRoomIdToAliasMapping(data[i].room_id, data[i].room_alias);
+ // TODO: select the smarter alias from the array
+ matrixService.createRoomIdToAliasMapping(data[i].room_id, data[i].aliases[0]);
}
else {
// last resort use the room id
--
GitLab