From: yomguy <yomguy@parisson.com>
Date: Tue, 29 Jan 2013 16:39:17 +0000 (+0100)
Subject: fix rooms
X-Git-Tag: 1.1~649
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=646eacedb7cb5a93e37d36b2fcb9b20bbcf19a1f;p=teleforma.git

fix rooms
---

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 5ac0c290..431ce9b0 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -121,20 +121,19 @@ def stream_from_file(__file):
 
 
 def get_room(content_type=None, id=None, name=None):
-    if settings.TELEFORMA_GLOBAL_TWEETER:
-        return jqchat.models.Room.objects.create(name='site')
+    if settings.TELEFORMA_GLOBAL_TWEETER or name == 'site':
+        rooms = jqchat.models.Room.objects.filter(name='site')
 
     else:
         rooms = jqchat.models.Room.objects.filter(content_type=content_type,
                                                     object_id=id)
-        if not rooms:
-            room = jqchat.models.Room.objects.create(content_type=content_type,
-                                              object_id=id,
-                                              name=name[:20])
-        else:
-            room = rooms[0]
-        return room
-
+    if not rooms:
+        room = jqchat.models.Room.objects.create(content_type=content_type,
+                                          object_id=id,
+                                          name=name[:20])
+    else:
+        room = rooms[0]
+    return room
 
 def get_access(obj, courses):
     access = False