diff options
| author | Thomas Bruederli <bruederli@kolabsys.com> | 2014-02-20 11:09:15 (GMT) |
|---|---|---|
| committer | Thomas Bruederli <bruederli@kolabsys.com> | 2014-02-20 11:09:15 (GMT) |
| commit | c1153b7c7214af35d7057f93592bb08d7de63f88 (patch) | |
| tree | 10dc6d50371c74273e2ddf2a843d847849c8d070 /wallace/module_resources.py | |
| parent | 4d460abbc06e0cc54f0a0b285708102829b618cc (diff) | |
| download | pykolab-c1153b7c7214af35d7057f93592bb08d7de63f88.tar.gz | |
Add the resource's common name when delegating; allow customized subject and text for iTip replies
Diffstat (limited to 'wallace/module_resources.py')
| -rw-r--r-- | wallace/module_resources.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/wallace/module_resources.py b/wallace/module_resources.py index dfd419a..b718ac4 100644 --- a/wallace/module_resources.py +++ b/wallace/module_resources.py @@ -358,7 +358,7 @@ def execute(*args, **kw): # - delegator: the original resource collection # - delegatee: the target resource # - itip_event['xml'].delegate(original_resource['mail'], _target_resource['mail']) + itip_event['xml'].delegate(original_resource['mail'], _target_resource['mail'], _target_resource['cn']) accept_reservation_request(itip_event, _target_resource, original_resource) done = True @@ -822,6 +822,7 @@ def send_response(from_address, itip_events): for itip_event in itip_events: attendee = itip_event['xml'].get_attendee_by_email(from_address) participant_status = itip_event['xml'].get_ical_attendee_participant_status(attendee) + message_text = None if participant_status == "DELEGATED": # Extra actions to take @@ -834,9 +835,14 @@ def send_response(from_address, itip_events): # restore list of attendees after to_message_itip() itip_event['xml']._attendees = [ delegator, delegatee ] itip_event['xml'].event.setAttendees(itip_event['xml']._attendees) + participant_status = "DELEGATED" + message_text = _(""" + Your reservation request was delegated to "%s" + which is available for the requested time. + """) % (delegatee.get_name()) - message = itip_event['xml'].to_message_itip(from_address, method="REPLY", participant_status=participant_status) + message = itip_event['xml'].to_message_itip(from_address, method="REPLY", participant_status=participant_status, message_text=message_text) smtp.sendmail(message['From'], message['To'], message.as_string()) smtp.quit() |