From 93c50e4cdceaadcfefa98e744ca147485a7a467d Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Thu, 3 Nov 2016 11:19:23 +0100 Subject: [PATCH] fix form_receipt_datetime type (#13837) --- tests/test_api.py | 2 ++ tests/test_formdata.py | 1 + wcs/formdata.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_api.py b/tests/test_api.py index 0e35f87..1f47d9a 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1017,6 +1017,8 @@ def test_user_forms(pub, local_user): assert resp.json[0]['form_name'] == 'test' assert resp.json[0]['form_slug'] == 'test' assert resp.json[0]['form_status'] == 'New' + assert datetime.datetime.strptime(resp.json[0]['form_receipt_datetime'], + '%Y-%m-%dT%H:%M:%S') assert resp.json[0]['keywords'] == ['hello', 'world'] assert resp.json == resp2.json == resp3.json diff --git a/tests/test_formdata.py b/tests/test_formdata.py index 2cfbc0c..cb70487 100644 --- a/tests/test_formdata.py +++ b/tests/test_formdata.py @@ -116,6 +116,7 @@ def test_just_created(pub): assert substvars.get('form_status_is_endpoint') == False assert substvars.get('form_receipt_date') assert substvars.get('form_receipt_time') + assert substvars.get('form_receipt_datetime') assert substvars.get('form_evolution') def test_field(pub): diff --git a/wcs/formdata.py b/wcs/formdata.py index 21d6944..570dbdf 100644 --- a/wcs/formdata.py +++ b/wcs/formdata.py @@ -482,7 +482,7 @@ class FormData(StorableObject): 'form_criticality_level': self.criticality_level, }) if self.receipt_time: - d['form_receipt_datetime'] = datetime.datetime(*self.receipt_time[:6]), + d['form_receipt_datetime'] = datetime.datetime(*self.receipt_time[:6]) d['form_status'] = self.get_status_label() -- 2.10.1