Changeset a8ca24 in indico

Timestamp:

08/23/11 15:38:55 (22 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

f69aa3

Parents:

3c95dd

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (05/27/11 10:25:12)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:55)

Message:

[IMP] Use separate arg for occurences

File:

• indico/MaKaC/plugins/RoomBooking/export.py (modified) (4 diffs)

indico/MaKaC/plugins/RoomBooking/export.py

@@ -215 +215 @@
         self._fromDT = utcdate(self._fromDT) if self._fromDT else None
         self._toDT = utcdate(self._toDT) if self._toDT else None
+        self._occurrences = get_query_parameter(qdata, ['occ', 'occurrences'], 'no') == 'yes'
         self._resvFilter = getResvStateFilter(qdata)
 
@@ -232 +233 @@
 
     def _addOccurrences(self, fossil, obj, startDT, endDT):
-        if self._detail == 'occurrences':
+        if self._occurrences:
+            (startDT, endDT) = (startDT or MIN_DATETIME,
+                                endDT or MAX_DATETIME)
             # get occurrences in the date interval
             fossil['occurrences'] = fossilize(itertools.ifilter(
@@ -244 +247 @@
     DETAIL_INTERFACES = {
         'rooms': IRoomMetadataFossil,
-        'reservations': IRoomMetadataWithReservationsFossil,
-        'occurrences': IRoomMetadataWithReservationsFossil
+        'reservations': IRoomMetadataWithReservationsFossil
     }
 
@@ -300 +302 @@
 class ReservationExportInterface(RoomBookingExportInterface):
     DETAIL_INTERFACES = {
-        'reservations': IReservationMetadataFossil,
-        'occurrences': IReservationMetadataFossil
+        'reservations': IReservationMetadataFossil
     }