# HG changeset patch # User Paul Boddie # Date 1445017144 -7200 # Node ID 85465e12b2a7e17e6bb4afb15a1ce8fe909d24c0 # Parent 7411013e727ef3382073b98bc2811905ecaac079 Let attendees remove recurrences when preparing counter-proposals. diff -r 7411013e727e -r 85465e12b2a7 imipweb/event.py --- a/imipweb/event.py Fri Oct 16 19:26:32 2015 +0200 +++ b/imipweb/event.py Fri Oct 16 19:39:04 2015 +0200 @@ -528,7 +528,13 @@ page.th("") page.td() - remove_type = self.can_remove_recurrence(period) and "submit" or "checkbox" + # Attendees can instantly remove recurrences and thus produce a + # counter-proposal. Organisers may need to unschedule recurrences + # instead. + + remove_type = self.can_change_object() and \ + (self.can_remove_recurrence(period) or not self.is_organiser()) and \ + "submit" or "checkbox" self.control("recur-remove", remove_type, str(index), str(index) in args.get("recur-remove", []), @@ -1177,7 +1183,7 @@ except (IndexError, ValueError): continue - if self.can_remove_recurrence(recurrence): + if self.can_remove_recurrence(recurrence) or not self.is_organiser(): del recurrences[i] correction += 1 else: