summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-12-02 13:40:36 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-12-02 13:40:36 +0100
commit3337283f0784d7f438e273da9b8ab3a642ace168 (patch)
tree7330715ad70fd8bb3cdd8867b96a2516e444178e
parent10fa4efdae95fd3fc020bdcc03c9a7f34a7a7550 (diff)
downloadpykolab-3337283f0784d7f438e273da9b8ab3a642ace168.tar.gz
No conflict needs to be detected if the incoming iTip is a transparent event either.
Reference T1988
-rw-r--r--pykolab/itip/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pykolab/itip/__init__.py b/pykolab/itip/__init__.py
index 4999fad..fe7db50 100644
--- a/pykolab/itip/__init__.py
+++ b/pykolab/itip/__init__.py
@@ -159,6 +159,9 @@ def check_event_conflict(kolab_event, itip_event):
if _is_transparent(kolab_event):
return conflict
+ if _is_transparent(itip_event['xml']):
+ return conflict
+
_es = to_dt(kolab_event.get_start())
_ee = to_dt(kolab_event.get_ical_dtend()) # use iCal style end date: next day for all-day events
_ev = kolab_event