Fix loading fields data with json.loads

erick-otenyo · May 25, 2023 · 6d819ab · 6d819ab
1 parent d64e637
commit 6d819ab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/wagtailmailchimp/models.py b/wagtailmailchimp/models.py
@@ -242,9 +242,19 @@ def get_data(self):
             "interest_categories": {}
         }
 
-        merge_fields_mapping = json.loads(self.merge_fields_mapping)
-
-        interest_categories = json.loads(self.interest_categories)
+        merge_fields_mapping = {}
+        if self.merge_fields_mapping:
+            try:
+                merge_fields_mapping = json.loads(self.merge_fields_mapping)
+            except Exception:
+                pass
+
+        interest_categories = {}
+        if self.interest_categories:
+            try:
+                interest_categories = json.loads(self.interest_categories)
+            except Exception:
+                pass
 
         for key, value in merge_fields_mapping.items():
             if key == "EMAIL":

diff --git a/wagtailmailchimp/views.py b/wagtailmailchimp/views.py
@@ -326,7 +326,10 @@ def mailchimp_integration_view(request, page_id):
 
     initial_data = None
     if form_page.merge_fields_mapping:
-        initial_data = json.loads(form_page.merge_fields_mapping)
+        try:
+            initial_data = json.loads(form_page.merge_fields_mapping)
+        except Exception:
+            pass
 
     form = MailchimpIntegrationForm(merge_fields=merge_fields, form_fields=form_fields, initial=initial_data)
     context.update({"form": form})