1.1 --- a/imipweb/event.py Mon Oct 05 19:47:10 2015 +0200
1.2 +++ b/imipweb/event.py Mon Oct 05 20:10:38 2015 +0200
1.3 @@ -24,7 +24,6 @@
1.4 from imiptools.mail import Messenger
1.5 from imiptools.period import have_conflict
1.6 from imipweb.data import EventPeriod, event_period_from_period, FormPeriod, PeriodError
1.7 -from imipweb.client import ManagerClient
1.8 from imipweb.resource import DateTimeFormUtilities, FormUtilities, ResourceClientForObject
1.9
1.10 class EventPageFragment(ResourceClientForObject, DateTimeFormUtilities, FormUtilities):
1.11 @@ -677,8 +676,7 @@
1.12 "A request handler for the event page."
1.13
1.14 def __init__(self, resource=None, messenger=None):
1.15 - ResourceClientForObject.__init__(self, resource)
1.16 - self.messenger = messenger or Messenger()
1.17 + ResourceClientForObject.__init__(self, resource, messenger or Messenger())
1.18
1.19 # Request logic methods.
1.20
1.21 @@ -776,18 +774,16 @@
1.22
1.23 if reply or invite or cancel:
1.24
1.25 - client = ManagerClient(self.obj, self.user, self.messenger)
1.26 -
1.27 # Process the object and remove it from the list of requests.
1.28
1.29 - if reply and client.process_received_request():
1.30 + if reply and self.process_received_request():
1.31 self.remove_request(self.uid, self.recurrenceid)
1.32
1.33 elif self.is_organiser() and (invite or cancel):
1.34
1.35 # Invitation, uninvitation and unscheduling...
1.36
1.37 - if client.process_created_request(
1.38 + if self.process_created_request(
1.39 invite and "REQUEST" or "CANCEL", to_cancel, to_unschedule):
1.40
1.41 self.remove_request(self.uid, self.recurrenceid)