summaryrefslogtreecommitdiffstats
path: root/wallace/module_resources.py
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-08-14 03:14:38 -0400
committerThomas Bruederli <bruederli@kolabsys.com>2014-08-14 03:14:38 -0400
commit262f1b2b2fb3831707dbb3f5948736a6c5ca5d3f (patch)
tree122deb41b8948ab0eeeb58b2144cbcdfbed6bb1e /wallace/module_resources.py
parent3cc6d87fb7ac57322e4e8b7d0321f280a49344cc (diff)
downloadpykolab-262f1b2b2fb3831707dbb3f5948736a6c5ca5d3f.tar.gz
Fix traceback errors in resource booking module (#3312)
Diffstat (limited to 'wallace/module_resources.py')
-rw-r--r--wallace/module_resources.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index d1f792b..55d7472 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -321,7 +321,8 @@ def execute(*args, **kw):
# process CANCEL messages
if not done and itip_event['method'] == "CANCEL":
for resource in resource_dns:
- if resources[resource]['mail'] in [a.get_email() for a in itip_event['xml'].get_attendees()]:
+ if resources[resource]['mail'] in [a.get_email() for a in itip_event['xml'].get_attendees()] \
+ and resources[resource].has_key('kolabtargetfolder'):
delete_resource_event(itip_event['uid'], resources[resource])
done = True
@@ -446,6 +447,8 @@ def check_availability(itip_events, resource_dns, resources, receiving_attendee=
if len(resources[resource]['conflicting_events']) > 0:
log.debug(_("Conflicting events: %r for resource %r") % (resources[resource]['conflicting_events'], resource), level=9)
+ done = False
+
# This is the event being conflicted with!
for itip_event in itip_events:
# Now we have the event that was conflicting