Skip to content

Commit 58072be

Browse files
committed
Fix for free-busy fbtype statuses
1 parent 96e5f68 commit 58072be

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## master
44

5+
## 3.2.0.a2
6+
7+
* Fix for free-busy `fbtype` statuses
8+
59
## 3.2.0.a1
610

711
* Added free-busy report

radicale/app/report.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ def free_busy_report(base_prefix: str, path: str, xml_request: Optional[ET.Eleme
8888

8989
fbtype = None
9090
if item.component_name == 'VEVENT':
91-
transp = getattr(item.vobject_item, 'transp', None)
91+
transp = getattr(item.vobject_item.vevent, 'transp', None)
9292
if transp and transp.value != 'OPAQUE':
9393
continue
9494

95-
status = getattr(item.vobject_item, 'status', None)
95+
status = getattr(item.vobject_item.vevent, 'status', None)
9696
if not status or status.value == 'CONFIRMED':
9797
fbtype = 'BUSY'
9898
elif status.value == 'CANCELLED':

radicale/tests/test_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,7 @@ def test_report_free_busy(self) -> None:
13831383
assert len(responses) == 1
13841384
vcalendar = list(responses.values())[0]
13851385
assert len(vcalendar.vfreebusy_list) == 2
1386+
# TODO: add other STATUS conversion types
13861387
for vfb in vcalendar.vfreebusy_list:
13871388
assert vfb.fbtype.value == 'BUSY'
13881389

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# When the version is updated, a new section in the CHANGELOG.md file must be
2121
# added too.
22-
VERSION = "3.2.0.a1"
22+
VERSION = "3.2.0.a2"
2323

2424
with open("README.md", encoding="utf-8") as f:
2525
long_description = f.read()

0 commit comments

Comments
 (0)