summaryrefslogtreecommitdiff
path: root/addons/caldav/caldav_node.py
diff options
context:
space:
mode:
authorron@tinyerp.com <>2011-10-21 11:11:13 +0530
committerron@tinyerp.com <>2011-10-21 11:11:13 +0530
commitae326f69099cc3a8a167ea5cd4bd3d37d3bafa4e (patch)
tree5fbeea3c7591ef4e34219f12a6834033182dfc93 /addons/caldav/caldav_node.py
parentc650f6eac93b8986fae89145d0cd14a67867aadd (diff)
parent9ada92fa884805e5ac147e7d82cbb24b028e82ab (diff)
[MERGE] Merged with lp:addons
bzr revid: ron@tinyerp.com-20111021054113-qitxy96fyx36fi8m
Diffstat (limited to 'addons/caldav/caldav_node.py')
-rw-r--r--addons/caldav/caldav_node.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 5272d0fc1fd..71e9bdc2468 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -324,7 +324,6 @@ class node_calendar(nodes.node_class):
uid = self.context.uid
res = self.set_data(cr, data)
-
if res and len(res):
# We arbitrarily construct only the first node of the data
# that have been imported. ICS may have had more elements,
@@ -332,6 +331,7 @@ class node_calendar(nodes.node_class):
assert isinstance(res[0], (int, long))
fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
domain=[('id','=',res[0])], context=ctx)
+
if self.context.get('DAV-client','') in ('iPhone', 'iCalendar',):
# For those buggy clients, register the alias
bca_obj = fil_obj.pool.get('basic.calendar.alias')