Merge branch 'master' into optimize_storage_collection

2016-07-07 17:52:16 +02:00
parent a9aa04bf16 8c225f019c
commit 10e7a776fc
3 changed files with 26 additions and 1 deletions
--- a/radicale/storage.py
+++ b/radicale/storage.py
@ -529,7 +529,8 @@ class Collection(BaseCollection):
            for item in items:
                for content in ("vevent", "vtodo", "vjournal"):
                    if content in item.contents:
-                        collection.add(getattr(item, content))
+                        for item_part in getattr(item, "%s_list" % content):
+                            collection.add(item_part)
                        break
            return collection.serialize()
        elif self.get_meta("tag") == "VADDRESSBOOK":