Changeset 3a3b0559117b8fa0bd787c535d5cf4c1675f32e1 in indico

Timestamp:

02/02/12 17:48:20 (4 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Children:

2979d1c8a0c92cf45c2a5e679117f407f028afce

Parents:

94fff24f37b433dbb078153fdcfba0d9eb58898d

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/02/12 17:48:20)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/15/12 17:19:47)

Message:

[FIX] Post-rebase fixes

Location:

indico

Files:

• MaKaC/plugins/Collaboration/http_api.py (modified) (4 diffs)
• MaKaC/plugins/Collaboration/indexes.py (modified) (1 diff)
• web/http_api/api.py (modified) (2 diffs)
• web/http_api/handlers.py (modified) (1 diff)
• web/http_api/ical.py (modified) (5 diffs)

indico/MaKaC/plugins/Collaboration/http_api.py

@@ -41 +41 @@
 
 
-def serialize_collaboration_alarm(fossil, now):
+def serialize_collaboration_alarm(cal, fossil, now):
     alarm = ical.Alarm()
     trigger = "-PT" + str(fossil['alarm']) + "M"  # iCalendar spec for pre-event trigger
@@ -48 +48 @@
     alarm.set('summary', "[" + fossil['type'] + "] " + fossil['status'] + " - " + fossil['title'].decode('utf-8'))
     alarm.set('description', str(fossil['url']))
-    return alarm
-
-
-def serialize_collaboration(fossil, now):
+    cal.add_component(alarm)
+
+
+def serialize_collaboration(cal, fossil, now):
     event = ical.Event()
     url = str(fossil['url'])
@@ -66 +66 @@
     if fossil.has_key('alarm'):
         event.add_component(serialize_collaboration_alarm(fossil, now))
-
-    return event
+    cal.add_component(event)
 
 
@@ -160 +159 @@
         'evo': 50000
     }
+    GUEST_ALLOWED = False
 
     def _getParams(self):

indico/MaKaC/plugins/Collaboration/indexes.py

@@ -229 +229 @@
             maxKey = None
 
-            if grouped:
-                return self._conferenceStartDateIndex._getBookingsGroupedByStartDate(minKey, maxKey, conferenceId,
+        if grouped:
+            return self._conferenceStartDateIndex._getBookingsGroupedByStartDate(minKey, maxKey, conferenceId,
                                                                                      categoryId, tz, dateFormat)
-            else:
-                return self._conferenceStartDateIndex.getBookings(minKey, maxKey, conferenceId, dateFormat)
+        else:
+            return self._conferenceStartDateIndex.getBookings(minKey, maxKey, conferenceId, categoryId)
 
     def dump(self):

indico/web/http_api/api.py

@@ -195 +195 @@
     def __call__(self, aw, req):
         """Perform the actual exporting"""
+        print 'HERE', self.GUEST_ALLOWED
         if self.HTTP_POST != (req.method == 'POST'):
             raise HTTPAPIError('This action requires %s' % ('POST' if self.HTTP_POST else 'GET'), apache.HTTP_METHOD_NOT_ALLOWED)
@@ -380 +381 @@
 
     def _process(self, iterator, filter=None, iface=None):
-        print 'process'
         if iface is None:
             iface = self.DETAIL_INTERFACES.get(self._detail)

indico/web/http_api/handlers.py

@@ -246 +246 @@
             else:
                 req.headers_out['Content-Type'] = serializer.getMIMEType()
-            print resultFossil
             return serializer(resultFossil)
         except:

indico/web/http_api/ical.py

@@ -52 +52 @@
 
 
-def serialize_event(self, fossil, now, id_prefix="indico-event"):
+def serialize_event(cal, fossil, now, id_prefix="indico-event"):
     event = ical.Event()
     event.set('uid', '%s-%s@cern.ch' % (id_prefix, fossil['id']))
@@ -68 +68 @@
     else:
         event.set('description', fossil['url'])
-    return event
+    cal.add_component(event)
 
 
@@ -86 +86 @@
 
 
-def serialize_reservation(fossil, now):
+def serialize_reservation(cal, fossil, now):
     event = ical.Event()
     event.set('uid', 'indico-resv-%s@cern.ch' % fossil['id'])
@@ -101 +101 @@
     if rrule:
         event.set('rrule', rrule)
-    return event
+    cal.add_component(event)
 
 
-def serialize_contribs(fossil, now):
+def serialize_contribs(cal, fossil, now):
     for sfossil in fossil['contributions']:
         if sfossil['startDate']:
             sfossil['id'] = "%s-%s" % (fossil['id'], sfossil['id'])
-            cal.add_component(serialize_event(sfossil, now, id_prefix="indico-contribution"))
+            serialize_event(cal, sfossil, now, id_prefix="indico-contribution")
 
 
@@ -136 +136 @@
         now = datetime.datetime.utcnow()
         for fossil in results:
-            mapper = ICalSerializer.mappers.get(fossil['_fossil'])
+            mapper = ICalSerializer._mappers.get(fossil['_fossil'])
             if mapper:
-                cal.add_component(mapper(fossil, now))
+                mapper(cal, fossil, now)
 
         return cal.to_ical()