tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug caused by commit:673da6a9

Browse Source
This commit is contained in:
Guillaume Ayoub 2010-12-17 17:19:39 +01:00
parent 673da6a90a
commit 72f3af9ab9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
radicale/xmlutils.py
View File

@ -97,22 +97,22 @@ def propfind(path, xml_request, calendar, depth, request):
multistatus = ET.Element(_tag("D", "multistatus")) multistatus = ET.Element(_tag("D", "multistatus"))
if depth == "0": if depth == "0":
elements = [calendar] items = [calendar]
elif depth == "1": elif depth == "1":
elements = [calendar] + calendar.events + calendar.todos items = [calendar] + calendar.events + calendar.todos
else: else:
# depth is infinity or not specified # depth is infinity or not specified
# we limit ourselves to depth == 1 # we limit ourselves to depth == 1
elements = [calendar] + calendar.events + calendar.todos items = [calendar] + calendar.events + calendar.todos
for element in elements: for item in items:
is_calendar = isinstance(element, ical.Calendar) is_calendar = isinstance(item, ical.Calendar)
response = ET.Element(_tag("D", "response")) response = ET.Element(_tag("D", "response"))
multistatus.append(response) multistatus.append(response)
href = ET.Element(_tag("D", "href")) href = ET.Element(_tag("D", "href"))
href.text = path if is_calendar else "%s/%s" % (path, element.name) href.text = path if is_calendar else "%s/%s" % (path, item.name)
response.append(href) response.append(href)
propstat = ET.Element(_tag("D", "propstat")) propstat = ET.Element(_tag("D", "propstat"))
@ -138,7 +138,7 @@ def propfind(path, xml_request, calendar, depth, request):
elif tag == _tag("D", "getcontenttype"): elif tag == _tag("D", "getcontenttype"):
element.text = "text/calendar" element.text = "text/calendar"
elif tag == _tag("D", "getetag"): elif tag == _tag("D", "getetag"):
element.text = element.etag element.text = item.etag
elif tag == _tag("D", "displayname"): elif tag == _tag("D", "displayname"):
element.text = calendar.name element.text = calendar.name
elif tag == _tag("D", "supported-report-set"): elif tag == _tag("D", "supported-report-set"):