1.1 --- a/imip_manager.py Tue Mar 03 00:26:11 2015 +0100
1.2 +++ b/imip_manager.py Wed Mar 04 16:49:59 2015 +0100
1.3 @@ -567,11 +567,12 @@
1.4
1.5 self.redirect(self.link_to("%s-0" % uid))
1.6
1.7 - def handle_request(self, uid, obj):
1.8 + def handle_request(self, uid, recurrenceid, obj):
1.9
1.10 """
1.11 - Handle actions involving the given 'uid' and 'obj' object, returning an
1.12 - error if one occurred, or None if the request was successfully handled.
1.13 + Handle actions involving the given 'uid', 'recurrenceid', and 'obj' as
1.14 + the object's representation, returning an error if one occurred, or None
1.15 + if the request was successfully handled.
1.16 """
1.17
1.18 # Handle a submitted form.
1.19 @@ -667,22 +668,22 @@
1.20 is_organiser and (invite or cancel) and \
1.21 handler.process_created_request(invite and "REQUEST" or "CANCEL", update, removed, added):
1.22
1.23 - self.remove_request(uid)
1.24 + self.remove_request(uid, recurrenceid)
1.25
1.26 # Save single user events.
1.27
1.28 elif save:
1.29 to_cancel = self.update_attendees(obj, added, removed)
1.30 - self.store.set_event(self.user, uid, None, node=obj.to_node())
1.31 - self.update_freebusy(uid, None, obj=obj)
1.32 - self.remove_request(uid)
1.33 + self.store.set_event(self.user, uid, recurrenceid, node=obj.to_node())
1.34 + self.update_freebusy(uid, recurrenceid, obj=obj)
1.35 + self.remove_request(uid, recurrenceid)
1.36
1.37 # Remove the request and the object.
1.38
1.39 elif discard:
1.40 - self.remove_from_freebusy(uid)
1.41 - self.remove_event(uid)
1.42 - self.remove_request(uid)
1.43 + self.remove_from_freebusy(uid, recurrenceid)
1.44 + self.remove_event(uid, recurrenceid)
1.45 + self.remove_request(uid, recurrenceid)
1.46
1.47 else:
1.48 handled = False
1.49 @@ -1283,7 +1284,7 @@
1.50 if not obj:
1.51 return False
1.52
1.53 - error = self.handle_request(uid, obj)
1.54 + error = self.handle_request(uid, recurrenceid, obj)
1.55
1.56 if not error:
1.57 return True