diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-11-07 12:20:34 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-11-07 12:20:34 +0100 |
commit | ff9d464608726d8c0825709db4903594f0ef6e9b (patch) | |
tree | eea1fac133e89ee7b301408c42951fefe2891318 | |
parent | aed0f49bba251f46d5bb63a88ba1245c51afe6b3 (diff) | |
parent | a63b24997ea768541e97c2d9df9d5c5202babf78 (diff) | |
download | Ishtar-ff9d464608726d8c0825709db4903594f0ef6e9b.tar.bz2 Ishtar-ff9d464608726d8c0825709db4903594f0ef6e9b.zip |
Merge branch 'master' into develop
-rw-r--r-- | ishtar_common/wizards.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 5cbc857c3..499f008b4 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -572,7 +572,14 @@ class Wizard(IshtarWizard): if data_key not in current_data: current_data[data_key] = {} current_data = current_data[data_key] - current_data[data_keys[-1]] = dct.pop(k) + value = dct.pop(k) + if isinstance(value, datetime.datetime): + value = value.strftime('%Y-%m-%dT%H:%M:%S') + elif isinstance(value, datetime.date): + value = value.strftime('%Y-%m-%d') + elif value is None: + value = '' + current_data[data_keys[-1]] = value continue vals = k.split('__') |