1.1 --- a/imipweb/event.py Sat Apr 04 22:16:11 2015 +0200
1.2 +++ b/imipweb/event.py Sat Apr 04 22:33:42 2015 +0200
1.3 @@ -389,24 +389,6 @@
1.4
1.5 return False
1.6
1.7 - def handle_attendees(self, obj):
1.8 -
1.9 - "Add or remove attendees. This does not affect the stored object."
1.10 -
1.11 - args = self.env.get_args()
1.12 -
1.13 - attendees = args.get("attendee", [])
1.14 -
1.15 - if args.has_key("add"):
1.16 - attendees.append("")
1.17 -
1.18 - if args.has_key("remove"):
1.19 - removed_attendee = args["remove"][0]
1.20 - if removed_attendee in attendees:
1.21 - attendees.remove(removed_attendee)
1.22 -
1.23 - return attendees
1.24 -
1.25 def get_event_period(self, obj):
1.26
1.27 """
1.28 @@ -425,6 +407,24 @@
1.29 dtend, dtend_attr = dtstart, dtstart_attr
1.30 return (dtstart, dtstart_attr), (dtend, dtend_attr)
1.31
1.32 + def get_attendees(self, obj):
1.33 +
1.34 + "Add or remove attendees. This does not affect the stored object."
1.35 +
1.36 + args = self.env.get_args()
1.37 +
1.38 + attendees = args.get("attendee", [])
1.39 +
1.40 + if args.has_key("add"):
1.41 + attendees.append("")
1.42 +
1.43 + if args.has_key("remove"):
1.44 + removed_attendee = args["remove"][0]
1.45 + if removed_attendee in attendees:
1.46 + attendees.remove(removed_attendee)
1.47 +
1.48 + return attendees
1.49 +
1.50 # Page fragment methods.
1.51
1.52 def show_request_controls(self, obj):
1.53 @@ -503,7 +503,7 @@
1.54 initial_load = not args.has_key("editing")
1.55
1.56 existing_attendees = uri_values(obj.get_values("ATTENDEE") or [])
1.57 - attendees = is_organiser and self.handle_attendees(obj) or \
1.58 + attendees = is_organiser and self.get_attendees(obj) or \
1.59 (initial_load or not is_organiser) and existing_attendees or []
1.60
1.61 (dtstart, dtstart_attr), (dtend, dtend_attr) = self.get_event_period(obj)