Changeset b270a2 in indico

Timestamp:

03/17/11 00:26:02 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

372f35

Parents:

e91f7d

Message:

[FIX] Fixing chat

Location:

indico/MaKaC/plugins/InstantMessaging/XMPP

Files:

• components.py (modified) (1 diff)
• handlers.py (modified) (1 diff)

indico/MaKaC/plugins/InstantMessaging/XMPP/components.py

@@ -301 +301 @@
         if not it means we're re-using an existing chat room """
         if conference is None:
-            conference = room.getConference()
+            conference = room.getConferences()[0]
         self.setSubject('[Indico] Chat room succesfully created')
         self.setBody("""    Dear Indico user,

indico/MaKaC/plugins/InstantMessaging/XMPP/handlers.py

@@ -177 +177 @@
                                             'conference': conference})
         except ServiceError, e:
-            Logger.get('ext.im').error("Exception while notifying observers: %s" %e)
-            raise ServiceError( message=self.messages['sameId']+e )
+            Logger.get('ext.im').exception("Exception while notifying observers: %s" %e)
+            raise ServiceError( message=self.messages['sameId']+str(e) )
         except NoReportError, e:
             Logger.get('ext.im').error("Room exists: %s" %e)