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 | c110e2c12168e635f3ce078727d69cf90a343222 (patch) | |
| tree | eea1fac133e89ee7b301408c42951fefe2891318 | |
| parent | fbf672345aead54813dcc36df2ef3af49eaa781d (diff) | |
| parent | 2263439dd29abab8373626a9b0f3bac09464f991 (diff) | |
| download | Ishtar-c110e2c12168e635f3ce078727d69cf90a343222.tar.bz2 Ishtar-c110e2c12168e635f3ce078727d69cf90a343222.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('__') |