From 4eec729dc2f22a9d6a3ef588a54e2ba99178aff4 Mon Sep 17 00:00:00 2001 From: Yingtong Li Date: Wed, 13 Feb 2019 15:24:14 +1100 Subject: [PATCH] Customise mandatory bulletin groups --- selfserv/settings.example.py | 2 +- sspromotions/jinja2/sspromotions/email/bulletin.html | 2 +- sspromotions/models.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfserv/settings.example.py b/selfserv/settings.example.py index 6088788..55fa19a 100644 --- a/selfserv/settings.example.py +++ b/selfserv/settings.example.py @@ -27,7 +27,7 @@ ALLOWED_HOSTS = [] PROMO_LOGO_URL = 'https://placehold.it/2000x500' PROMO_LOGO_LINK = 'https://example.com' - +PROMO_GROUPS_MANDATORY = ['All Years'] # Application definition diff --git a/sspromotions/jinja2/sspromotions/email/bulletin.html b/sspromotions/jinja2/sspromotions/email/bulletin.html index fcdf787..02142af 100644 --- a/sspromotions/jinja2/sspromotions/email/bulletin.html +++ b/sspromotions/jinja2/sspromotions/email/bulletin.html @@ -62,7 +62,7 @@

{{ group.name }}

{% if group.group.subscribable %}
Unsubscribe
- {% elif group.name != 'All Years' %} + {% elif group.name not in settings.PROMO_GROUPS_MANDATORY %}
Change year level
{% endif %} diff --git a/sspromotions/models.py b/sspromotions/models.py index ae3ad1b..64c1daf 100644 --- a/sspromotions/models.py +++ b/sspromotions/models.py @@ -50,7 +50,7 @@ class Group(models.Model): if self.subscribable: return GroupSubscription.objects.filter(member=member, group=self).count() > 0 - if self.name == 'All Years': + if self.name in settings.PROMO_GROUPS_MANDATORY: return True if next(v for k, v in Member.YEARS if k == member.year) in self.name.split('/'): # Year level group