1.1 --- a/imiptools/handlers/resource.py Thu Mar 05 15:26:50 2015 +0100
1.2 +++ b/imiptools/handlers/resource.py Thu Mar 05 16:30:13 2015 +0100
1.3 @@ -88,6 +88,11 @@
1.4 event = self.obj.to_node()
1.5 self.store.set_event(attendee, self.uid, self.recurrenceid, event)
1.6
1.7 + # Remove additional recurrences if handling a complete event.
1.8 +
1.9 + if not self.recurrenceid:
1.10 + self.store.remove_recurrences(attendee, self.uid)
1.11 +
1.12 # Only update free/busy details if the event is scheduled.
1.13
1.14 if scheduled:
1.15 @@ -95,12 +100,11 @@
1.16 else:
1.17 self.remove_from_freebusy(freebusy)
1.18
1.19 - # Subtract any recurrences from the free/busy details of a parent
1.20 - # object.
1.21 + # Remove either original recurrence or additional recurrence
1.22 + # details depending on whether an additional recurrence or a
1.23 + # complete event are being handled, respectively.
1.24
1.25 - for recurrenceid in self.store.get_recurrences(attendee, self.uid):
1.26 - remove_affected_period(freebusy, self.uid, recurrenceid)
1.27 -
1.28 + self.remove_freebusy_for_recurrences(freebusy)
1.29 self.store.set_freebusy(attendee, freebusy)
1.30
1.31 if self.publisher: