Send submission to entire newsletter if subscriptions are empty

newsletter/models.py

@@ -538,7 +538,10 @@ def __unicode__(self):
         }
 
     def submit(self):
-        subscriptions = self.subscriptions.filter(subscribed=True)
+        if self.subscriptions.all().count() == 0:
+            subscriptions = self.newsletter.subscription_set.filter(subscribed=True)
+        else:
+            subscriptions = self.subscriptions.filter(subscribed=True)
 
         logger.info(
             ugettext(u"Submitting %(submission)s to %(count)d people"),

newsletter/tests/test_mailing.py

@@ -105,7 +105,7 @@ def test_submission_from_message(self):
         self.assertFalse(sub.sending)
 
     def test_submission_subscribed(self):
-        """ Test a simpel submission with single subscriber. """
+        """ Test a simple submission with single subscriber. """
 
         self.s.subscribed = False
         self.s.save()
@@ -214,6 +214,28 @@ def test_submitsubmission(self):
         self.assertEmailContains(submission.message.title)
         self.assertEmailContains(submission.newsletter.unsubscribe_url())
 
+    def test_submitsubmission_with_empty_list(self):
+        """ Test submission with empty subscription list. """
+
+        self.sub.prepared = True
+        self.sub.publish_date = now() - timedelta(seconds=1)
+        self.sub.subscriptions.clear()
+        self.sub.save()
+
+        Submission.submit_queue()
+
+        # Get the object fresh from DB, as to assure no caching takes place
+        submission = Submission.objects.get(pk=self.sub.pk)
+
+        self.assert_(submission.sent)
+        self.assertFalse(submission.sending)
+
+        # Make sure mail is being sent out
+        self.assertEquals(len(mail.outbox), 1)
+
+        # Make sure a submission contains the title and unsubscribe URL
+        self.assertEmailContains(submission.message.title)
+        self.assertEmailContains(submission.newsletter.unsubscribe_url())
 
 class SubscriptionTestCase(UserTestCase, MailingTestCase):
     def setUp(self):

requirements.txt

@@ -1,6 +1,7 @@
 django-extensions
 Django>=1.4.10
 vobject
+Pillow
 chardet
 surlex>=0.2.0
 sorl-thumbnail