summaryrefslogtreecommitdiff
path: root/chimere/utils.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-15 01:12:13 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-15 01:12:13 +0200
commiteb347add15c8c04a2e464c9153620bd41f2d0a2f (patch)
tree9d9ca7e822df3ba7e6864540d0406f0557345b33 /chimere/utils.py
parent20d155e5ccf647ce7d77ea86fae8cf36e2df9692 (diff)
parent48e705e7ce868a55086794932dda92c060c228e8 (diff)
downloadChimère-eb347add15c8c04a2e464c9153620bd41f2d0a2f.tar.bz2
Chimère-eb347add15c8c04a2e464c9153620bd41f2d0a2f.zip
Merge branch 'v2.2' into v3.0
Conflicts: chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'chimere/utils.py')
-rw-r--r--chimere/utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/chimere/utils.py b/chimere/utils.py
index 20dc99e..11c9c4e 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -1263,6 +1263,10 @@ class HtmlXsltManager(ImportManager):
dct['description'] = item.get('description', '')
if 'date' in item:
dct.update(self.parse_date(item['date']))
+ if "start_date" in item and item["start_date"]:
+ dct['start_date'] = item["start_date"]
+ if "end_date" in item and item["end_date"]:
+ dct['end_date'] = item["end_date"]
key = item['key']
it, updated, created = self.create_or_update_item(cls, dct, key,
category=category)