From ece389ea8fa9f762a88d1d16905e222b11455438 Mon Sep 17 00:00:00 2001 From: erichhasl Date: Wed, 12 Jul 2017 18:15:55 +0200 Subject: [PATCH] add mail of parents --- jdav_web/mailer/models.py | 5 ++++- jdav_web/members/admin.py | 2 +- jdav_web/members/models.py | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py index 5af5916..36a76b5 100644 --- a/jdav_web/mailer/models.py +++ b/jdav_web/mailer/models.py @@ -87,9 +87,12 @@ class Message(models.Model): print("sending mail to", filtered) attach = [a.f.path for a in Attachment.objects.filter(msg__id=self.pk) if a.f.name] + emails = [member.email for member in filtered] + emails.extend([member.email_parents for member in filtered + if member.email_parents]) success = send(self.subject, get_content(self.content), SENDING_ADDRESS, - [member.email for member in filtered], + emails, attachments=attach, reply_to=self.reply_to.email if self.reply_to else None) for a in Attachment.objects.filter(msg__id=self.pk): diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index bd78be1..23084e9 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -23,7 +23,7 @@ from easy_select2 import apply_select2 # Register your models here. class MemberAdmin(admin.ModelAdmin): - fields = ['prename', 'lastname', 'email', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', + fields = ['prename', 'lastname', 'email', 'email_parents', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', 'gets_newsletter', 'queue', 'registration_form', 'comments'] list_display = ('name', 'birth_date', 'gets_newsletter', 'get_group', 'queue', 'created', 'comments') list_filter = ('group', 'gets_newsletter', 'queue') diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 6a08f0e..ecc1d0e 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -54,6 +54,8 @@ class Member(models.Model): phone_number = models.CharField(max_length=12, verbose_name=_('phone number'), default='', blank=True) phone_number_parents = models.CharField(max_length=12, verbose_name=_('parents phone number'), default='', blank=True) email = models.EmailField(max_length=100, default="") + email_parents = models.EmailField(max_length=100, default="", blank=True, + verbose_name=_("Parents' Email")) birth_date = models.DateField(_('birth date')) # to determine the age group = models.ManyToManyField(Group, verbose_name=_('group')) gets_newsletter = models.BooleanField(_('receives newsletter'),