From 8f9b00f461c5f9ddaebbe9da4cecfab18834c751 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 6 Feb 2017 17:16:23 +0100 Subject: Harmonize CSV import and CSV exports - Imports: multi format parse of dates --- ishtar_common/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index c27f9cc29..c9903525d 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2228,7 +2228,10 @@ class FormaterType(models.Model): pass return UnicodeFormater(**kwargs) elif self.formater_type == 'DateFormater': - return DateFormater(self.options, **kwargs) + date_formats = self.options + if self.many_split: + date_formats = self.options.split(kwargs.pop('many_split')) + return DateFormater(date_formats, **kwargs) elif self.formater_type == 'StrToBoolean': return StrToBoolean(**kwargs) elif self.formater_type == 'UnknowType': -- cgit v1.2.3