From 7a38d29ae21d8b59350380d66150ec506adb2fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 13 Jul 2018 13:35:47 +0200 Subject: [PATCH] backoffice: don't crash on missing drafts (#25266) --- wcs/backoffice/submission.py | 5 ++++- wcs/forms/root.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wcs/backoffice/submission.py b/wcs/backoffice/submission.py index 4e9f3115..1e97e7a8 100644 --- a/wcs/backoffice/submission.py +++ b/wcs/backoffice/submission.py @@ -113,7 +113,10 @@ class FormFillPage(PublicFormFillPage): else: draft_formdata_id = data.get('draft_formdata_id') if draft_formdata_id: - formdata = self.formdef.data_class().get(draft_formdata_id) + try: + formdata = self.formdef.data_class().get(draft_formdata_id) + except KeyError: + pass if self.formdef.enable_tracking_codes and not self.edit_mode: r += htmltext('

%s

') % _('Tracking Code') diff --git a/wcs/forms/root.py b/wcs/forms/root.py index 6344ca4b..ce2af184 100644 --- a/wcs/forms/root.py +++ b/wcs/forms/root.py @@ -463,7 +463,10 @@ class FormPage(Directory, FormTemplateMixin): formdata.user_id = None draft_formdata_id = formdata.data.get('draft_formdata_id') if draft_formdata_id: - formdata = self.formdef.data_class().get(draft_formdata_id) + try: + formdata = self.formdef.data_class().get(draft_formdata_id) + except KeyError: + pass formdata.status = '' return formdata -- 2.18.0