瀏覽代碼

Merge pull request #198 from untitaker/discovery

Return user basepath for current-user-principal
Guillaume Ayoub 11 年之前
父節點
當前提交
788b775c32
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      radicale/xmlutils.py

+ 1 - 4
radicale/xmlutils.py

@@ -297,10 +297,7 @@ def _propfind_response(path, item, props, user):
             # pylint: enable=W0511
             # pylint: enable=W0511
         elif tag == _tag("D", "current-user-principal") and user:
         elif tag == _tag("D", "current-user-principal") and user:
             tag = ET.Element(_tag("D", "href"))
             tag = ET.Element(_tag("D", "href"))
-            if item.resource_type == "addressbook":
-                tag.text = _href("/%s/addressbook.vcf/" % user)
-            else:
-                tag.text = _href("/%s/calendar.ics/" % user)
+            tag.text = _href("/%s/" % user)
             element.append(tag)
             element.append(tag)
         elif tag == _tag("D", "current-user-privilege-set"):
         elif tag == _tag("D", "current-user-privilege-set"):
             privilege = ET.Element(_tag("D", "privilege"))
             privilege = ET.Element(_tag("D", "privilege"))