wallace/module_resources.py

[Thomas Brüderli]

 wallace/module_resources.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 262f1b2b2fb3831707dbb3f5948736a6c5ca5d3f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Aug 14 03:14:38 2014 -0400

    Fix traceback errors in resource booking module (#3312)

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