From 6067dcbfefb1a108d6392e5f7f57e2cc70d68b59 Mon Sep 17 00:00:00 2001 From: Russ Housley Date: Sat, 3 Nov 2018 11:55:07 +0000 Subject: [PATCH] Allow a mail alias for all review team secretaries. Fixes #2139. Commit ready for merge. - Legacy-Id: 15708 --- ietf/mailtrigger/models.py | 5 ++++- ...0003_reviewteamsettings_secr_mail_alias.py | 20 +++++++++++++++++++ ietf/review/models.py | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ietf/review/migrations/0003_reviewteamsettings_secr_mail_alias.py diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py index d990f2004..ea3b5eba4 100644 --- a/ietf/mailtrigger/models.py +++ b/ietf/mailtrigger/models.py @@ -172,7 +172,10 @@ class Recipient(models.Model): if 'group' in kwargs: group = kwargs['group'] if not group.acronym=='none': - addrs.extend(group.role_set.filter(name='secr').values_list('email__address',flat=True)) + if group.reviewteamsettings and group.reviewteamsettings.secr_mail_alias: + addrs = [group.reviewteamsettings.secr_mail_alias, ] + else: + addrs.extend(group.role_set.filter(name='secr').values_list('email__address',flat=True)) return addrs def gather_doc_group_responsible_directors(self, **kwargs): diff --git a/ietf/review/migrations/0003_reviewteamsettings_secr_mail_alias.py b/ietf/review/migrations/0003_reviewteamsettings_secr_mail_alias.py new file mode 100644 index 000000000..5130e0424 --- /dev/null +++ b/ietf/review/migrations/0003_reviewteamsettings_secr_mail_alias.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.16 on 2018-11-03 03:10 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('review', '0002_unavailableperiod_reason'), + ] + + operations = [ + migrations.AddField( + model_name='reviewteamsettings', + name='secr_mail_alias', + field=models.CharField(blank=True, help_text=b'Email alias for all of the review team secretaries', max_length=255, verbose_name=b'Email alias for all of the review team secretaries'), + ), + ] diff --git a/ietf/review/models.py b/ietf/review/models.py index 97243aebb..084e136a6 100644 --- a/ietf/review/models.py +++ b/ietf/review/models.py @@ -161,6 +161,7 @@ class ReviewTeamSettings(models.Model): autosuggest = models.BooleanField(default=True, verbose_name="Automatically suggest possible review requests") review_types = models.ManyToManyField(ReviewTypeName, default=get_default_review_types) review_results = models.ManyToManyField(ReviewResultName, default=get_default_review_results) + secr_mail_alias = models.CharField(verbose_name="Email alias for all of the review team secretaries", max_length=255, blank=True, help_text="Email alias for all of the review team secretaries") def __unicode__(self): return u"%s" % (self.group.acronym,)