odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

CalDAV: Fix support for WebCal 

CalDAV+GroupDAV is a collection of .ics files (resources). WebCal is a
single .ics resource with all calendar data in it. So, support both of
those nodes for every calendar instance, eg:
 /dbname/Calendars/Meetings     : collection
 /dbname/Calendars/Meetings.ics : vcalendar file

bzr revid: p_christ@hol.gr-20100810122957-a1691wv8ultbki55
This commit is contained in:
P. Christeas 2010-08-10 15:29:57 +03:00
parent 97f6f059e1
commit 6ad4fbfc80
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/caldav/caldav_node.py
View File

@ -71,8 +71,8 @@ class node_calendar_collection(nodes.node_dir):
where = [('collection_id','=',self.dir_id)]
ext = False
if name and name.endswith('.ics'):
name = name[-4]
ext = '.ics'
name = name[:-4]
ext = True
if name:
where.append(('name','=',name))
if not domain:
@ -81,11 +81,12 @@ class node_calendar_collection(nodes.node_dir):
fil_obj = dirobj.pool.get('basic.calendar')
ids = fil_obj.search(cr,uid,where,context=ctx)
res = []
for calender in fil_obj.browse(cr, uid, ids, context=ctx):
if not ext:
res.append(node_calendar(calender.name, self, self.context, calender))
else:
res.append(res_node_calendar(name, self, self.context, calender))
for cal in fil_obj.browse(cr, uid, ids, context=ctx):
if (not name) or not ext:
res.append(node_calendar(cal.name, self, self.context, cal))
if (not name) or ext:
res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
# May be both of them!
return res
def _get_dav_owner(self, cr):