Просмотр исходного кода

Merge pull request #487 from Unrud/filter

Fix empty filter
Guillaume Ayoub 9 лет назад
Родитель
Сommit
c532948348
2 измененных файлов с 5 добавлено и 1 удалено
  1. 3 0
      radicale/tests/test_base.py
  2. 2 1
      radicale/xmlutils.py

+ 3 - 0
radicale/tests/test_base.py

@@ -267,6 +267,9 @@ class BaseRequestsMixIn:
                </C:calendar-query>""" % filters_text)
                </C:calendar-query>""" % filters_text)
         return answer
         return answer
 
 
+    def test_calendar_empty_filter(self):
+        self._test_filter([""])
+
     def test_calendar_tag_filter(self):
     def test_calendar_tag_filter(self):
         """Report request with tag-based filter on calendar."""
         """Report request with tag-based filter on calendar."""
         assert "href>/calendar.ics/event1.ics</" in self._test_filter(["""
         assert "href>/calendar.ics/event1.ics</" in self._test_filter(["""

+ 2 - 1
radicale/xmlutils.py

@@ -809,7 +809,8 @@ def report(path, xml_request, collection):
                 match = (
                 match = (
                     _comp_match if collection.get_meta("tag") == "VCALENDAR"
                     _comp_match if collection.get_meta("tag") == "VCALENDAR"
                     else _prop_match)
                     else _prop_match)
-                if not all(match(item, filter_[0]) for filter_ in filters):
+                if not all(match(item, filter_[0]) for filter_ in filters
+                           if filter_):
                     continue
                     continue
 
 
             found_props = []
             found_props = []