1.1 --- a/imiptools/handlers/person.py Thu Feb 05 19:01:22 2015 +0100
1.2 +++ b/imiptools/handlers/person.py Thu Feb 05 19:02:00 2015 +0100
1.3 @@ -47,16 +47,6 @@
1.4 if not self.have_new_object(attendee):
1.5 continue
1.6
1.7 - # Record other party free/busy information.
1.8 -
1.9 - if organiser != attendee:
1.10 - freebusy = self.store.get_freebusy_for_other(attendee, organiser)
1.11 -
1.12 - if organiser_attr.get("PARTSTAT") != "DECLINED":
1.13 - self.update_freebusy_for_other(freebusy, attendee, organiser, self.obj.get_periods())
1.14 - else:
1.15 - self.remove_from_freebusy_for_other(freebusy, attendee, organiser)
1.16 -
1.17 # Store the object and queue any request.
1.18
1.19 self.store.set_event(attendee, self.uid, self.obj.to_node())
1.20 @@ -75,38 +65,13 @@
1.21 if self.publisher:
1.22 self.publisher.set_freebusy(attendee, freebusy)
1.23
1.24 + self.update_freebusy_from_organiser(attendee, organiser_item)
1.25 +
1.26 # As organiser, update attendance.
1.27
1.28 else:
1.29 - obj = self.get_object(organiser)
1.30 -
1.31 - if obj and self.have_new_object(organiser, obj=obj):
1.32 -
1.33 - # Get attendee details in a usable form.
1.34 -
1.35 - attendee_map = uri_dict(obj.get_value_map("ATTENDEE"))
1.36 -
1.37 - for attendee, attendee_attr in attendees.items():
1.38 -
1.39 - # Update attendance in the loaded object.
1.40 -
1.41 - attendee_map[attendee] = attendee_attr
1.42 -
1.43 - # Record other party free/busy information.
1.44 -
1.45 - if organiser != attendee:
1.46 - freebusy = self.store.get_freebusy_for_other(organiser, attendee)
1.47 -
1.48 - if attendee_attr.get("PARTSTAT") != "DECLINED":
1.49 - self.update_freebusy_for_other(freebusy, organiser, attendee, self.obj.get_periods())
1.50 - else:
1.51 - self.remove_from_freebusy_for_other(freebusy, organiser, attendee)
1.52 -
1.53 - # Set the new details and store the object.
1.54 -
1.55 - obj["ATTENDEE"] = attendee_map.items()
1.56 -
1.57 - self.store.set_event(organiser, self.uid, obj.to_node())
1.58 + if self.merge_attendance(attendees, organiser):
1.59 + self.update_freebusy_from_attendees(organiser, attendees)
1.60
1.61 return True
1.62