Merged in [12099] from rjsparks@nostrum.com:

    Changes interim announcements and interim cancellation announcements to use mailtriggers. Adds irtf-announce to announcements for IRTF groups. Fixes ietf-tools#2018.
 - Legacy-Id: 12100
Note: SVN reference [12099] has been migrated to Git commit 5b32cc2

Author: levkowetz

changelog

@@ -1,3 +1,29 @@
+ietfdb (6.34.3) ietf; urgency=medium
+
+  * Merged in [12082] from rcross@amsl.com:
+    Fixed an issue where interim meeting request form didn't list research
+    groups when the logged-in user was both a working group chair and a
+    research group chair.  
+
+  * Made it possible to merge nominations with inactive email addresses.
+    By default the SearchableEmail form field only displays active email
+    addresses, but this use case needs all known email addresses.
+
+  * Fixed inclusion of tablesorter css and js for use when displaying the
+    SQL query list in development mode.
+
+  * Added admin support for the DocumentAuthor model.
+
+  * Fixed a place where email addresses which were not all lowercase could
+    slip in, which messed up some reverse table relationships.  (This was
+    found by running our check_referential_integrity management command.)
+
+  * Fixed a problem with the error message text for the nominee email edit 
+    form.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  05 Oct 2016 11:56:01 -0700
+
+
 ietfdb (6.34.2) ietf; urgency=medium
 
   **Draft submission and document DOI fixes**

ietf/mailtrigger/migrations/0007_add_interim_announce.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+    Recipient=apps.get_model('mailtrigger','Recipient')
+
+    Recipient.objects.create(
+        slug='group_stream_announce',
+        desc="The group's stream's announce list",
+        template="{% if group.type_id == 'wg' %}IETF-Announce <ietf-announce@ietf.org>{% elif group.type_id == 'rg' %}IRTF-Announce <irtf-announce@irtf.org>{% endif %}"
+    )
+
+    annc = MailTrigger.objects.create(
+        slug='interim_announced',
+        desc='Recipients when an interim meeting is announced',
+    )
+    annc.to = Recipient.objects.filter(slug__in=['ietf_announce','stream_announce'])
+    annc.cc = Recipient.objects.filter(slug__in=['group_mail_list',])
+
+    annc = MailTrigger.objects.create(
+        slug='interim_cancelled',
+        desc='Recipients when an interim meeting is cancelled',
+    )
+    annc.to = Recipient.objects.filter(slug__in=['ietf_announce','stream_aanounce'])
+    annc.cc = Recipient.objects.filter(slug__in=['group_chairs','group_mail_list','logged_in_person'])
+
+
+def reverse(apps, schema_editor):
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+    Recipient=apps.get_model('mailtrigger','Recipient')
+
+    MailTrigger.objects.filter(slug__in=['interim_announced','interim_cancelled']).delete()
+    Recipient.objects.filter(slug='group_stream_announce').delete()
+  
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0006_auto_20160707_1933'),
+    ]
+
+    operations = [
+       migrations.RunPython(forward,reverse),
+    ]

ietf/meeting/helpers.py

@@ -409,8 +409,7 @@ def get_announcement_initial(meeting, is_change=False):
     group = meeting.session_set.first().group
     in_person = bool(meeting.city)
     initial = {}
-    initial['to'] = settings.INTERIM_ANNOUNCE_TO_EMAIL
-    initial['cc'] = group.list_email
+    (initial['to'],initial['cc']) = gather_address_lists('interim_announced',group=group)
     initial['frm'] = settings.INTERIM_ANNOUNCE_FROM_EMAIL
     if in_person:
         desc = 'Interim'
@@ -585,8 +584,7 @@ def send_interim_cancellation_notice(meeting):
     """Sends an email that a scheduled interim meeting has been cancelled."""
     session = meeting.session_set.first()
     group = session.group
-    to_email = settings.INTERIM_ANNOUNCE_TO_EMAIL
-    (_, cc_list) = gather_address_lists('session_request_cancelled',group=group)
+    (to_email, cc_list) = gather_address_lists('interim_cancelled',group=group)
     from_email = settings.INTERIM_ANNOUNCE_FROM_EMAIL
     subject = '{group} ({acronym}) {type} Interim Meeting Cancelled (was {date})'.format(
         group=group.name,

ietf/meeting/test_data.py

@@ -47,7 +47,7 @@ def make_meeting_test_data(meeting=None):
     room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123, functional_name="Testing Ground")
     room.session_types.add("session")
     room.resources.add(projector)
-    asname = RoomResourceName.objects.create(name='Audio Stream', slug='audiostream')
+    asname = RoomResourceName.objects.get(slug='audiostream')
     UrlResource.objects.create(name=asname, room=room, url='http://ietf{number}streaming.dnsalias.net/ietf/ietf{number}1.m3u'.format(number=meeting.number))
 
     # another room