Changeset b49d75 in indico

Timestamp:

03/22/12 15:20:40 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

c8a3a93

Parents:

fe97fd

Message:

[FIX] Location webcast export ics and detail

• Fixed location info when exporting video services
• If detail=event Indico will not export contributions data for video services

Location:

indico/MaKaC/plugins/Collaboration

Files:

• fossils.py (modified) (1 diff)
• http_api.py (modified) (3 diffs)

indico/MaKaC/plugins/Collaboration/fossils.py

@@ -278 +278 @@
     def getURL(self):
         pass
-    getURL.produce = lambda s: Collaboration.collaborationTools.CollaborationTools.getConferenceOrContributionURL(s)
+    getURL.produce = lambda s: str(Collaboration.collaborationTools.CollaborationTools.getConferenceOrContributionURL(s))
     getURL.name = 'url'
 

indico/MaKaC/plugins/Collaboration/http_api.py

@@ -276 +276 @@
                                 contributions.append(tempContrib)
 
-                        if len(contributions) == 0: # If we are here, no contributions but a request exists.
+                        if len(contributions) == 0 or self._detail == "event": # If we are here, no contributions but a request exists.
                             bk.setStartDate(bk._conf.getStartDate())
                             bk.setEndDate(bk._conf.getEndDate())
@@ -310 +310 @@
     """
 
-    _orig = None
-    _contrib = None
-    _startDate = None
-    _endDate = None
-
     def __init__(self, booking, contrib):
         self._orig = booking
         self._contrib = contrib
+        self._startDate = None
+        self._endDate = None
 
     def __getattr__(self, name):
@@ -354 +351 @@
     def getEndDate(self):
         return self._endDate
+
+    def getLocation(self):
+        return self._contrib.getLocation().getName() if self._contrib.getLocation() else ""
+
+    def getRoom(self):
+        return self._contrib.getRoom().getName() if self._contrib.getRoom() else ""