From 2d197d1ae0d516ffa7186fcd6e02ed46d6e5fee0 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 21 Apr 2025 22:18:56 +0200 Subject: [PATCH 1/5] fix broken value extract from property for https://github.com/Kozea/Radicale/issues/1760 --- radicale/item/filter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radicale/item/filter.py b/radicale/item/filter.py index 209bd1cb..61d9b61a 100644 --- a/radicale/item/filter.py +++ b/radicale/item/filter.py @@ -475,9 +475,9 @@ def visit_time_ranges(vobject_item: vobject.base.Component, child_name: str, else: # Match a property child = getattr(vobject_item, child_name.lower()) - if isinstance(child, date): - child_is_datetime = isinstance(child, datetime) - child = date_to_datetime(child) + if isinstance(child.value, date): + child_is_datetime = isinstance(child.value, datetime) + child = date_to_datetime(child.value) if child_is_datetime: range_fn(child, child + SECOND, False) else: From 8382ee1223109318a10eb178c4316deb1f41eb94 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 21 Apr 2025 22:19:25 +0200 Subject: [PATCH 2/5] add test case for https://github.com/Kozea/Radicale/issues/1760 --- radicale/tests/test_base.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py index 63c420e9..75df0592 100644 --- a/radicale/tests/test_base.py +++ b/radicale/tests/test_base.py @@ -1304,6 +1304,17 @@ permissions: RrWw""") """], "todo", items=range(1, 9)) assert "/calendar.ics/todo7.ics" in answer + def test_time_range_filter_todos_completed(self) -> None: + answer = self._test_filter(["""\ + + + + + + +"""], "todo", items=range(1, 9)) + assert "/calendar.ics/todo6.ics" in answer + def test_time_range_filter_todos_rrule(self) -> None: """Report request with time-range filter on todos with rrules.""" answer = self._test_filter(["""\ From be01ba63363b049955eaf57a066294cb16bc8321 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 21 Apr 2025 22:20:04 +0200 Subject: [PATCH 3/5] cosmetics --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5163164..a9bc2518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## 3.5.2.dev -* Adjust: [auth] ldap: use _ldap_user_attr either first element of list or directly +* Adjust: [auth] ldap: use ldap_user_attr either first element of list or directly ## 3.5.1 @@ -10,7 +10,7 @@ * Extend: [storage] hook supports now placeholder for "cwd" and "path" (and catches unsupported placeholders) * Fix: location of lock file for in case of dedicated cache folder is activated * Extend: log and create base folders if not existing during startup -* Adjust: [auth] ldap: use _ldap_user_attr as string +* Adjust: [auth] ldap: use ldap_user_attr as string ## 3.5.0 From e6d289f772b1092a79e94b17af85f1315446c5d2 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 21 Apr 2025 22:20:46 +0200 Subject: [PATCH 4/5] changelog for https://github.com/Kozea/Radicale/issues/1760 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9bc2518..c41f019e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 3.5.2.dev * Adjust: [auth] ldap: use ldap_user_attr either first element of list or directly +* Fix: use value of property for time range filter ## 3.5.1 From 06b7e98ea21c7e5694f7bf2385c83e20d7c99cfd Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 21 Apr 2025 22:22:02 +0200 Subject: [PATCH 5/5] extend copyright --- radicale/item/filter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radicale/item/filter.py b/radicale/item/filter.py index 61d9b61a..47a777db 100644 --- a/radicale/item/filter.py +++ b/radicale/item/filter.py @@ -3,7 +3,8 @@ # Copyright © 2008 Pascal Halter # Copyright © 2008-2015 Guillaume Ayoub # Copyright © 2017-2021 Unrud -# Copyright © 2024-2024 Peter Bieringer +# Copyright © 2023-2024 Ray +# Copyright © 2024-2025 Peter Bieringer # # This library is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by