1.1 --- a/imiptools/handlers/person.py Sun Sep 06 02:17:33 2015 +0200
1.2 +++ b/imiptools/handlers/person.py Sun Sep 06 17:59:02 2015 +0200
1.3 @@ -91,14 +91,6 @@
1.4 if not self.have_new_object() or not self.is_attendee(self.user):
1.5 return False
1.6
1.7 - # Indicate the organiser's implicit attendance if mentioned in the
1.8 - # cancellation message.
1.9 -
1.10 - if cancel:
1.11 - obj_attendees = uri_dict(self.obj.get_value_map("ATTENDEE"))
1.12 - if obj_attendees.has_key(organiser):
1.13 - obj_attendees[organiser]["PARTSTAT"] = "DECLINED"
1.14 -
1.15 # Remove additional recurrences if handling a complete event.
1.16
1.17 if not self.recurrenceid:
1.18 @@ -112,7 +104,7 @@
1.19 # Cancel complete events or particular occurrences in recurring
1.20 # events.
1.21
1.22 - elif cancel:
1.23 + if cancel:
1.24 self.store.cancel_event(self.user, self.uid, self.recurrenceid)
1.25
1.26 # Remove any associated request.
1.27 @@ -125,9 +117,12 @@
1.28
1.29 self.remove_event_from_freebusy()
1.30
1.31 - # Update the recipient's record of the organiser's schedule.
1.32 + # Update the recipient's record of the organiser's schedule.
1.33
1.34 - self.update_freebusy_from_organiser(organiser)
1.35 + self.remove_freebusy_from_organiser(organiser)
1.36 +
1.37 + else:
1.38 + self.update_freebusy_from_organiser(organiser)
1.39
1.40 # Set the complete event or an additional occurrence.
1.41