mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-06 06:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a lot of details

Browse source
This commit is contained in:
Guillaume Ayoub 2016-04-12 18:21:18 +02:00
parent 406027f3c9
commit e586569b31
4 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
radicale/xmlutils.py
View file

@ -239,7 +239,18 @@ def _propfind_response(path, item, props, user, write=False):
response = ET.Element(_tag("D", "response"))
href = ET.Element(_tag("D", "href"))
uri = item.path if is_collection else "%s/%s" % (path, item.href)
if is_collection:
uri = item.path
else:
# TODO: fix this
if path.split("/")[-1] == item.href:
# Happening when depth is 0
uri = path
else:
# Happening when depth is 1
uri = "/".join((path, item.href))
# TODO: fix this
href.text = _href(uri.replace("//", "/"))
response.append(href)
@ -549,8 +560,15 @@ def report(path, xml_request, collection):
else:
not_found_props.append(element)
# TODO: fix this
if hreference.split("/")[-1] == item.href:
# Happening when depth is 0
uri = "/" + hreference
else:
# Happening when depth is 1
uri = posixpath.join(hreference, item.href)
multistatus.append(_item_response(
posixpath.join(hreference, item.href), found_props=found_props,
uri, found_props=found_props,
not_found_props=not_found_props, found_item=True))
return _pretty_xml(multistatus)