]> git.parisson.com Git - teleforma.git/commitdiff
fix rooms
authoryomguy <yomguy@parisson.com>
Tue, 29 Jan 2013 16:39:17 +0000 (17:39 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 29 Jan 2013 16:39:17 +0000 (17:39 +0100)
teleforma/views/core.py

index 5ac0c2906e4d9e7a1be41dddfa041b8be8dc95c5..431ce9b07e985dca576b176e1eadae5c368e486b 100644 (file)
@@ -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