group select now many to many field

jdav_web/mailer/admin.py

@@ -8,7 +8,7 @@ from .models import Message
 
 class MessageAdmin(admin.ModelAdmin):
     """Message creation view"""
-    list_display = ('subject', 'from_addr', 'to_group', 'sent')
+    list_display = ('subject', 'from_addr', 'get_groups', 'sent')
     change_form_template = "mailer/change_form.html"
 
     actions = ['send_message']

jdav_web/mailer/models.py

@@ -9,17 +9,27 @@ class Message(models.Model):
     from_addr = models.EmailField(_('from email'))
     subject = models.CharField(_('subject'), max_length=50)
     content = models.TextField(_('content'))
-    to_group = models.ForeignKey('members.Group', verbose_name=_('to group'))
+    to_groups = models.ManyToManyField('members.Group',
+                                       verbose_name=_('to group'))
     sent = models.BooleanField(_('sent'), default=False)
 
     def __str__(self):
         return self.subject
 
+    def get_groups(self):
+        return ", ".join([g.name for g in self.to_groups.all()])
+    get_groups.short_description = _('recipicients')
+
     def submit(self):
         """Sends the mail to the specified group of members"""
+        members = set()
+        for group in self.to_groups.all():
+            group_members = group.member_set.all()
+            for member in group_members:
+                members.add(member)
         data = [
             (self.subject, self.content, self.from_addr, [member.email])
-            for member in self.to_group.member_set.all()
+            for member in members
         ]
         send_mass_mail(data)
         self.sent = True