From 40496908b05c33dafb2f8f7d18cd92c2c8522ecd Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 18 Dec 2019 11:51:00 +0100
Subject: [PATCH] Handle empty address on application projects.
---
opentech/apply/projects/models.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/opentech/apply/projects/models.py b/opentech/apply/projects/models.py
index 87993c947..dfb436022 100644
--- a/opentech/apply/projects/models.py
+++ b/opentech/apply/projects/models.py
@@ -393,12 +393,16 @@ class Project(BaseStreamForm, AccessFormData, models.Model):
return self.get_status_display()
def get_address_display(self):
- address = json.loads(self.contact_address)
- return ', '.join(
- address.get(field)
- for field in ADDRESS_FIELDS_ORDER
- if address.get(field)
- )
+ try:
+ address = json.loads(self.contact_address)
+ except json.JSONDecodeError:
+ return ''
+ else:
+ return ', '.join(
+ address.get(field)
+ for field in ADDRESS_FIELDS_ORDER
+ if address.get(field)
+ )
@classmethod
def create_from_submission(cls, submission):
--
GitLab