klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-10 20:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs in mailings with new club tools

Browse Source
This commit is contained in:
Antoine Bartuccio
2017-10-02 13:16:43 +02:00
parent 4800db3c2c
commit 8146186447
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
club/views.py
View File

@ -563,6 +563,7 @@ class MailingSubscriptionDeleteView(CanEditMixin, DeleteView):
def get_success_url(self, **kwargs):
return reverse_lazy('club:mailing', kwargs={'club_id': self.club_id})
class MailingAutoGenerationView(View):
def dispatch(self, request, *args, **kwargs):
@ -573,13 +574,13 @@ class MailingAutoGenerationView(View):
def get(self, request, *args, **kwargs):
club = self.mailing.club
already_subscribed = [sub.user for sub in self.mailing.subscriptions.all()]
members = club.members.filter(role__gte=settings.SITH_CLUB_ROLES_ID['Board member'])
members = members.exclude(user__in=already_subscribed)
self.mailing.subscriptions.all().delete()
members = club.members.filter(role__gte=settings.SITH_CLUB_ROLES_ID['Board member']).exclude(end_date__lte=timezone.now())
for member in members.all():
MailingSubscription(user=member.user, mailing=self.mailing).save()
return redirect('club:mailing', club_id=club.id)
class MailingAutoCleanView(View):
def dispatch(self, request, *args, **kwargs):
@ -589,6 +590,5 @@ class MailingAutoCleanView(View):
return super(MailingAutoCleanView, self).dispatch(request, *args, **kwargs)
def get(self, request, *args, **kwargs):
for sub in self.mailing.subscriptions.all():
sub.delete()
self.mailing.subscriptions.all().delete()
return redirect('club:mailing', club_id=self.mailing.club.id)