From c4731b03d33ccfeb6198fe4cd58e57a772658a88 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Sun, 18 Mar 2018 21:22:44 +0000
Subject: [PATCH] Prevent error if data is not converted to the new form

---
 opentech/apply/funds/models.py | 2 +-
 opentech/apply/funds/views.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index 0667648e0..d607fcfd4 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -580,7 +580,7 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss
 
         for field in self.form_fields:
             if isinstance(field.block, UploadableMediaBlock):
-                file = self.form_data[field.id]
+                file = self.form_data.get(field.id, {})
                 self.form_data[field.id] = self.handle_files(file)
 
         if not self.id:
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 6e6d0661b..205f6d0e7 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -158,9 +158,9 @@ class SubmissionEditView(UpdateView):
         instance = kwargs.pop('instance')
         form_data = instance.form_data
 
-        # convert certain data to the correct field id
         for field in self.object.form_fields:
             if isinstance(field.block, MustIncludeFieldBlock):
+                # convert certain data to the correct field id
                 try:
                     response = form_data[field.block.name]
                 except KeyError:
-- 
GitLab