1.1 --- a/imipweb/data.py Sun Oct 15 22:16:05 2017 +0200
1.2 +++ b/imipweb/data.py Sun Oct 15 23:21:37 2017 +0200
1.3 @@ -154,15 +154,25 @@
1.4
1.5 "Return a counter-proposal mapping from attendees to objects."
1.6
1.7 - # Get counter-proposals for the specific object.
1.8 -
1.9 - attendees = self.store.get_counters(self.user, self.uid, self.recurrenceid)
1.10 d = {}
1.11
1.12 - for attendee in attendees:
1.13 - if not d.has_key(attendee):
1.14 - d[attendee] = []
1.15 - d[attendee].append(self.get_stored_object(self.uid, self.recurrenceid, "counters", attendee))
1.16 + # Get counter-proposals for the specific object.
1.17 +
1.18 + recurrenceids = [self.recurrenceid]
1.19 +
1.20 + # And for all recurrences associated with a parent object.
1.21 +
1.22 + if not self.recurrenceid:
1.23 + recurrenceids += self.store.get_counter_recurrences(self.user, self.uid)
1.24 +
1.25 + # Map attendees to objects.
1.26 +
1.27 + for recurrenceid in recurrenceids:
1.28 + attendees = self.store.get_counters(self.user, self.uid, recurrenceid)
1.29 + for attendee in attendees:
1.30 + if not d.has_key(attendee):
1.31 + d[attendee] = []
1.32 + d[attendee].append(self.get_stored_object(self.uid, recurrenceid, "counters", attendee))
1.33
1.34 return d
1.35