1.1 --- a/imipweb/event.py Sun May 17 21:41:27 2015 +0200
1.2 +++ b/imipweb/event.py Sun May 17 22:35:39 2015 +0200
1.3 @@ -23,8 +23,7 @@
1.4 from imiptools.client import update_attendees, update_participation
1.5 from imiptools.data import get_uri, uri_dict, uri_values
1.6 from imiptools.dates import format_datetime, get_datetime_item, \
1.7 - get_period_item, get_recurrence_start, to_date, \
1.8 - to_timezone
1.9 + get_period_item, to_date, to_timezone
1.10 from imiptools.mail import Messenger
1.11 from imiptools.period import have_conflict
1.12 from imipweb.data import EventPeriod, \
1.13 @@ -64,21 +63,6 @@
1.14 def is_organiser(self, obj):
1.15 return get_uri(obj.get_value("ORGANIZER")) == self.user
1.16
1.17 - def is_replaced(self, period, recurrenceids):
1.18 - for s in recurrenceids:
1.19 - dt = get_recurrence_start(s, self.get_tzid())
1.20 - if period.get_start() == dt:
1.21 - return s
1.22 - return None
1.23 -
1.24 - def is_affected(self, period, recurrenceid):
1.25 - if not recurrenceid:
1.26 - return None
1.27 - dt = get_recurrence_start(recurrenceid, self.get_tzid())
1.28 - if period.get_start() == dt:
1.29 - return recurrenceid
1.30 - return None
1.31 -
1.32 # Request logic methods.
1.33
1.34 def handle_request(self, obj):
1.35 @@ -854,7 +838,7 @@
1.36 # Obtain the user's timezone.
1.37
1.38 tzid = self.get_tzid()
1.39 - periods = obj.get_periods_for_freebusy(self.get_tzid(), self.get_window_end())
1.40 + periods = obj.get_periods(self.get_tzid(), self.get_window_end())
1.41
1.42 # Indicate whether there are conflicting events.
1.43