1.1 --- a/imipweb/event.py Sun May 17 19:25:22 2015 +0200
1.2 +++ b/imipweb/event.py Sun May 17 19:31:54 2015 +0200
1.3 @@ -22,8 +22,9 @@
1.4 from datetime import date, timedelta
1.5 from imiptools.client import update_attendees, update_participation
1.6 from imiptools.data import get_uri, uri_dict, uri_values
1.7 -from imiptools.dates import format_datetime, get_datetime, get_datetime_item, \
1.8 - get_period_item, to_date, to_datetime, to_timezone
1.9 +from imiptools.dates import format_datetime, get_datetime_item, \
1.10 + get_period_item, get_recurrence_start, to_date, \
1.11 + to_timezone
1.12 from imiptools.mail import Messenger
1.13 from imiptools.period import have_conflict
1.14 from imipweb.data import EventPeriod, \
1.15 @@ -65,16 +66,16 @@
1.16
1.17 def is_replaced(self, period, recurrenceids):
1.18 for s in recurrenceids:
1.19 - dt = to_timezone(get_datetime(s), self.get_tzid())
1.20 - if to_datetime(period.get_start(), self.get_tzid()) == dt:
1.21 + dt = get_recurrence_start(s, self.get_tzid())
1.22 + if period.get_start() == dt:
1.23 return s
1.24 return None
1.25
1.26 def is_affected(self, period, recurrenceid):
1.27 if not recurrenceid:
1.28 return None
1.29 - dt = to_timezone(get_datetime(recurrenceid), self.get_tzid())
1.30 - if to_datetime(period.get_start(), self.get_tzid()) == dt:
1.31 + dt = get_recurrence_start(recurrenceid, self.get_tzid())
1.32 + if period.get_start() == dt:
1.33 return recurrenceid
1.34 return None
1.35