Luke Plant avatar Luke Plant committed 8f94bc9

Fixed a few logic errors in email list creation.

Comments (0)

Files changed (1)

contacts/lists.py

 
     for hg in HomeGroup.objects.exclude(group_email=''):
         if hg.group_email != '':
-            email_list = list(set([c.email for c in hg.contact_set.exclude(email='',
-                                                                           include_on_email_lists=False)]))
+            email_list = list(set([c.email
+                                   for c in hg.contact_set.exclude(email='').filter(include_on_email_lists=True)]))
             email_list_s = ', '.join(email_list)
             if hg.group_email in webfaction_email_list:
                 # Update:
                 s.create_email(hg.group_email, email_list_s)
 
     # Lists for all church members and all contacts
-    contacts = []
-    members = []
-    for c in Contact.objects.exclude(email='',
-                                     include_on_email_lists=False):
+    contacts = set()
+    members = set()
+    for c in Contact.objects.exclude(email='').filter(include_on_email_lists=True):
         if c.church_member:
-            members.append(c.email)
-        contacts.append(c.email)
+            members.add(c.email)
+        contacts.add(c.email)
 
-    s.update_email('church-contacts@christchurchbradford.org.uk', ', '.join(contacts))
-    s.update_email('church-members@christchurchbradford.org.uk', ', '.join(members))
+    s.update_email('church-contacts@christchurchbradford.org.uk', ', '.join(list(contacts)))
+    s.update_email('church-members@christchurchbradford.org.uk', ', '.join(list(members)))
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.