1.1 --- a/imipweb/resource.py Thu Sep 03 17:28:00 2015 +0200
1.2 +++ b/imipweb/resource.py Thu Sep 03 19:00:50 2015 +0200
1.3 @@ -23,7 +23,7 @@
1.4 from imiptools.client import Client
1.5 from imiptools.data import get_uri, uri_values
1.6 from imiptools.dates import get_recurrence_start_point
1.7 -from imiptools.period import FreeBusyPeriod, remove_period, remove_affected_period
1.8 +from imiptools.period import remove_period, remove_affected_period
1.9 from imipweb.env import CGIEnvironment
1.10 import babel.dates
1.11 import imip_store
1.12 @@ -138,22 +138,11 @@
1.13 recurrenceids = self._get_recurrences(uid)
1.14
1.15 # Obtain only active periods, not those replaced by redefined
1.16 - # recurrences.
1.17 + # recurrences, converting to free/busy periods.
1.18
1.19 for p in obj.get_active_periods(recurrenceids, self.get_tzid(), self.get_window_end()):
1.20 -
1.21 - # Convert the periods to more substantial free/busy items.
1.22 + summary.append(obj.get_freebusy_period(p))
1.23
1.24 - summary.append(
1.25 - FreeBusyPeriod(
1.26 - p.get_start_point(),
1.27 - p.get_end_point(),
1.28 - uid,
1.29 - obj.get_value("TRANSP"),
1.30 - recurrenceid,
1.31 - obj.get_value("SUMMARY"),
1.32 - obj.get_value("ORGANIZER")
1.33 - ))
1.34 return summary
1.35
1.36 # Preference methods.