1.1 --- a/imipweb/event.py Sat May 16 01:03:51 2015 +0200
1.2 +++ b/imipweb/event.py Sat May 16 18:09:37 2015 +0200
1.3 @@ -26,7 +26,7 @@
1.4 get_datetime_item, get_period_item, \
1.5 to_timezone, to_utc_datetime
1.6 from imiptools.mail import Messenger
1.7 -from imiptools.period import convert_periods, have_conflict
1.8 +from imiptools.period import have_conflict
1.9 from imipweb.data import EventPeriod, \
1.10 event_period_from_period, form_period_from_period, \
1.11 FormDate, FormPeriod, PeriodError
1.12 @@ -212,8 +212,8 @@
1.13 "Set in the given 'obj' the given 'period' as the main start and end."
1.14
1.15 p = event_period_from_period(period)
1.16 - result = self.set_datetime_in_object(p.start, p.start_attr and p.start_attr.get("TZID"), "DTSTART", obj)
1.17 - result = self.set_datetime_in_object(p.end, p.end_attr and p.end_attr.get("TZID"), "DTEND", obj) or result
1.18 + result = self.set_datetime_in_object(p.get_start(), p.start_attr and p.start_attr.get("TZID"), "DTSTART", obj)
1.19 + result = self.set_datetime_in_object(p.get_end(), p.end_attr and p.end_attr.get("TZID"), "DTEND", obj) or result
1.20 return result
1.21
1.22 def set_periods_in_object(self, obj, periods):
1.23 @@ -231,7 +231,7 @@
1.24 for p in periods:
1.25 if p.origin != "RRULE":
1.26 tzid = p.start_attr and p.start_attr.get("TZID") or p.end_attr and p.end_attr.get("TZID")
1.27 - new_rdates.append(get_period_item(p.start, p.end, tzid))
1.28 + new_rdates.append(get_period_item(p.get_start(), p.get_end(), tzid))
1.29
1.30 obj["RDATE"] = new_rdates
1.31
1.32 @@ -873,7 +873,6 @@
1.33
1.34 for p in have_conflict(freebusy, periods, True):
1.35 period = event_period_from_period(p)
1.36 - convert_periods([period], tzid)
1.37 if self.is_replaced(period, recurrenceids):
1.38 continue
1.39 if (p.uid != uid or (recurrenceid and p.recurrenceid) and p.recurrenceid != recurrenceid) and p.transp != "ORG":
1.40 @@ -900,8 +899,8 @@
1.41
1.42 # Provide details of any conflicting event.
1.43
1.44 - start = self.format_datetime(to_timezone(get_datetime(p.start), tzid), "long")
1.45 - end = self.format_datetime(to_timezone(get_datetime(p.end), tzid), "long")
1.46 + start = self.format_datetime(p.get_start(tzid), "long")
1.47 + end = self.format_datetime(p.get_end(tzid), "long")
1.48
1.49 page.tr()
1.50