oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-01 18:18:31 +00:00
Code Wiki Activity

Merge 80bd41c97e into 9c14b5c263

Browse source
This commit is contained in:
Peter Bieringer 2025-07-31 16:55:48 +00:00 • committed by GitHub
commit 3fbea97f96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
radicale/app/report.py
View file

@ -275,10 +275,14 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element],
found_props = [] found_props = []
not_found_props = [] not_found_props = []
item_etag: str = ""
for prop in props: for prop in props:
element = ET.Element(prop.tag) element = ET.Element(prop.tag)
if prop.tag == xmlutils.make_clark("D:getetag"): if prop.tag == xmlutils.make_clark("D:getetag"):
if expand is not None:
item_etag = item.etag
else:
element.text = item.etag element.text = item.etag
found_props.append(element) found_props.append(element)
elif prop.tag == xmlutils.make_clark("D:getcontenttype"): elif prop.tag == xmlutils.make_clark("D:getcontenttype"):
@ -341,7 +345,7 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element],
if found_props or not_found_props: if found_props or not_found_props:
multistatus.append(xml_item_response( multistatus.append(xml_item_response(
base_prefix, uri, found_props=found_props, base_prefix, uri, found_props=found_props,
not_found_props=not_found_props, found_item=True)) not_found_props=not_found_props, found_item=True, item_etag=item_etag))
return client.MULTI_STATUS, multistatus return client.MULTI_STATUS, multistatus
@ -660,7 +664,7 @@ def _find_overridden(
def xml_item_response(base_prefix: str, href: str, def xml_item_response(base_prefix: str, href: str,
found_props: Sequence[ET.Element] = (), found_props: Sequence[ET.Element] = (),
not_found_props: Sequence[ET.Element] = (), not_found_props: Sequence[ET.Element] = (),
found_item: bool = True) -> ET.Element: found_item: bool = True, item_etag: str = "") -> ET.Element:
response = ET.Element(xmlutils.make_clark("D:response")) response = ET.Element(xmlutils.make_clark("D:response"))
href_element = ET.Element(xmlutils.make_clark("D:href")) href_element = ET.Element(xmlutils.make_clark("D:href"))
@ -674,6 +678,10 @@ def xml_item_response(base_prefix: str, href: str,
status = ET.Element(xmlutils.make_clark("D:status")) status = ET.Element(xmlutils.make_clark("D:status"))
status.text = xmlutils.make_response(code) status.text = xmlutils.make_response(code)
prop_element = ET.Element(xmlutils.make_clark("D:prop")) prop_element = ET.Element(xmlutils.make_clark("D:prop"))
if (item_etag != "") and (code == 200):
prop_etag = ET.Element(xmlutils.make_clark("D:getetag"))
prop_etag.text = item_etag
prop_element.append(prop_etag)
for prop in props: for prop in props:
prop_element.append(prop) prop_element.append(prop)
propstat.append(prop_element) propstat.append(prop_element)