Fix exception when campaign has no mailing list

2 files changed, 12 insertions, 1 deletions

diff --git a/colossus/apps/campaigns/forms.py b/colossus/apps/campaigns/forms.py
index 6f675cf..3ec7666 100644
--- a/colossus/apps/campaigns/forms.py
+++ b/colossus/apps/campaigns/forms.py
@@ -72,7 +72,7 @@ class CampaignRecipientsForm(forms.ModelForm):
                 self.fields['tag'].queryset = Tag.objects.filter(mailing_list_id=mailing_list_id).order_by('name')
             except (ValueError, TypeError):
                 pass
-        elif self.instance.pk:
+        elif self.instance.pk and self.instance.mailing_list:
             self.fields['tag'].queryset = self.instance.mailing_list.tags.order_by('name')
 
 
diff --git a/colossus/apps/campaigns/tests/test_views.py b/colossus/apps/campaigns/tests/test_views.py
index 48f314b..d4525bf 100644
--- a/colossus/apps/campaigns/tests/test_views.py
+++ b/colossus/apps/campaigns/tests/test_views.py
@@ -92,3 +92,14 @@ class CampaignCreateViewTests(AuthenticatedTestCase):
         response = self.client.get(self.url)
         self.assertContains(response, '<input type="hidden"', 3)  # csrf_token, mailing_list, tag
         self.assertContains(response, '<input type="text"', 1)  # name tag
+
+
+class TestCampaignEditRecipientsViewNoneMailingList(AuthenticatedTestCase):
+    def setUp(self):
+        super().setUp()
+        self.campaign = CampaignFactory(mailing_list=None)
+        self.url = reverse('campaigns:campaign_edit_recipients', kwargs={'pk': self.campaign.pk})
+        self.response = self.client.get(self.url)
+
+    def test_status_code(self):
+        self.assertEqual(200, self.response.status_code)