1.1 --- a/imipweb/event.py Sun Aug 02 00:11:39 2015 +0200
1.2 +++ b/imipweb/event.py Sun Aug 02 01:04:59 2015 +0200
1.3 @@ -493,7 +493,7 @@
1.4
1.5 recurrenceid = obj.get_recurrenceid()
1.6 recurrenceids = self._get_recurrences(uid)
1.7 - replaced = not recurrenceid and self.is_replaced(p, recurrenceids)
1.8 + replaced = not recurrenceid and p.is_replaced(recurrenceids)
1.9
1.10 # Provide a summary of the object.
1.11
1.12 @@ -743,7 +743,7 @@
1.13 args = self.env.get_args()
1.14
1.15 p = event_period_from_period(period)
1.16 - replaced = not recurrenceid and self.is_replaced(p, recurrenceids)
1.17 + replaced = not recurrenceid and p.is_replaced(recurrenceids)
1.18
1.19 # Isolate the controls from neighbouring tables.
1.20
1.21 @@ -830,7 +830,7 @@
1.22 partstat = participant_attr and participant_attr.get("PARTSTAT")
1.23
1.24 for p in have_conflict(freebusy, periods, True):
1.25 - if not recurrenceid and self.is_replaced(p, recurrenceids):
1.26 + if not recurrenceid and p.is_replaced(recurrenceids):
1.27 continue
1.28
1.29 if ( # Unidentified or different event
1.30 @@ -1000,7 +1000,7 @@
1.31 _name = self.element_name
1.32
1.33 p = event_period_from_period(period)
1.34 - replaced = not recurrenceid and self.is_replaced(p, recurrenceids)
1.35 + replaced = not recurrenceid and p.is_replaced(recurrenceids)
1.36
1.37 # Show controls for editing as organiser.
1.38
1.39 @@ -1055,11 +1055,11 @@
1.40 page = self.page
1.41
1.42 p = event_period_from_period(period)
1.43 - replaced = not recurrenceid and self.is_replaced(p, recurrenceids)
1.44 + replaced = not recurrenceid and p.is_replaced(recurrenceids)
1.45
1.46 css = " ".join([
1.47 replaced and "replaced" or "",
1.48 - self.is_affected(p, recurrenceid) and "affected" or ""
1.49 + p.is_affected(recurrenceid) and "affected" or ""
1.50 ])
1.51
1.52 formdate = show_start and p.get_form_start() or p.get_form_end()