# HG changeset patch # User Paul Boddie # Date 1428179622 -7200 # Node ID 06e7afb8016087801012d871c2bceee5429fe8cc # Parent fdb49e7201e1442792bdf4ea921044bd43d67999 Renamed handle_attendees to get_attendees and moved the definition, since it is only called when continuing to edit an event. diff -r fdb49e7201e1 -r 06e7afb80160 imipweb/event.py --- a/imipweb/event.py Sat Apr 04 22:16:11 2015 +0200 +++ b/imipweb/event.py Sat Apr 04 22:33:42 2015 +0200 @@ -389,24 +389,6 @@ return False - def handle_attendees(self, obj): - - "Add or remove attendees. This does not affect the stored object." - - args = self.env.get_args() - - attendees = args.get("attendee", []) - - if args.has_key("add"): - attendees.append("") - - if args.has_key("remove"): - removed_attendee = args["remove"][0] - if removed_attendee in attendees: - attendees.remove(removed_attendee) - - return attendees - def get_event_period(self, obj): """ @@ -425,6 +407,24 @@ dtend, dtend_attr = dtstart, dtstart_attr return (dtstart, dtstart_attr), (dtend, dtend_attr) + def get_attendees(self, obj): + + "Add or remove attendees. This does not affect the stored object." + + args = self.env.get_args() + + attendees = args.get("attendee", []) + + if args.has_key("add"): + attendees.append("") + + if args.has_key("remove"): + removed_attendee = args["remove"][0] + if removed_attendee in attendees: + attendees.remove(removed_attendee) + + return attendees + # Page fragment methods. def show_request_controls(self, obj): @@ -503,7 +503,7 @@ initial_load = not args.has_key("editing") existing_attendees = uri_values(obj.get_values("ATTENDEE") or []) - attendees = is_organiser and self.handle_attendees(obj) or \ + attendees = is_organiser and self.get_attendees(obj) or \ (initial_load or not is_organiser) and existing_attendees or [] (dtstart, dtstart_attr), (dtend, dtend_attr) = self.get_event_period(obj)