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

Merge pull request #382 from untitaker/tag-filters-fix

Browse Source 
Unbreak tag filters
This commit is contained in:
Guillaume Ayoub 2016-04-21 09:04:25 +09:00
commit 89e2226b16
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/xmlutils.py
View File

@ -507,11 +507,12 @@ def report(path, xml_request, collection):
# TODO: handle the nested comp-filters correctly # TODO: handle the nested comp-filters correctly
# Read rfc4791-9.7.1 for info # Read rfc4791-9.7.1 for info
tag_filters = set( tag_filters = set(
element.get("name") for element element.get("name").upper() for element
in root.findall(".//%s" % _tag("C", "comp-filter"))) in root.findall(".//%s" % _tag("C", "comp-filter")))
tag_filters.discard("VCALENDAR")
else: else:
hreferences = () hreferences = ()
tag_filters = None tag_filters = set()
# Writing answer # Writing answer
multistatus = ET.Element(_tag("D", "multistatus")) multistatus = ET.Element(_tag("D", "multistatus"))
@ -537,7 +538,9 @@ def report(path, xml_request, collection):
items = [collection.get(href) for href, etag in collection.list()] items = [collection.get(href) for href, etag in collection.list()]
for item in items: for item in items:
if tag_filters and item.name not in tag_filters: if tag_filters and \
item.name not in tag_filters and \
not set(x.upper() for x in item.contents) & tag_filters:
continue continue
found_props = [] found_props = []