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

    Allow the nomcom to collect feedback on arbitrary topics. Fixes ietf-tools#2256 and ietf-tools#1846.
 - Legacy-Id: 13506
Note: SVN reference [13474] has been migrated to Git commit 4813177

Author: levkowetz

ietf/dbtemplate/fixtures/nomcom_templates.xml

@@ -172,4 +172,14 @@ The questionaire is repeated below for your convenience.
 --------</field>
         <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
     </object>
+    <object pk="12" model="dbtemplate.dbtemplate">
+      <field type="CharField" name="path">/nomcom/defaults/topic/description</field>
+      <field type="CharField" name="title">Description of Topic</field>
+      <field type="TextField" name="variables">$topic: Topic'</field>
+      <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
+      <field type="TextField" name="content">This is a description of the topic "$topic"
+
+Describe the topic and add any information/instructions for the responder here.
+</field>
+    </object>
 </django-objects>

ietf/dbtemplate/migrations/0005_add_default_topic_description.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-05-24 09:30
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    DBTemplate.objects.create(
+        path='/nomcom/defaults/topic/description',
+        title='Description of Topic',
+        variables='$topic: Topic',
+        type_id='rst',
+        content="""This is a description of the topic "$topic"
+
+Describe the topic and add any information/instructions for the responder here.
+""",
+    )
+
+def reverse(apps, schema_editor):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    DBTemplate.objects.filter(path='/nomcom/defaults/topic/description').delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dbtemplate', '0004_team_review_content_templates'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse),
+    ]

ietf/dbtemplate/migrations/0006_adjust_feedback_receipt_template.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-05-24 14:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_migration):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    t = DBTemplate.objects.get(path='/nomcom/defaults/email/feedback_receipt.txt')
+    t.variables="""$about: What this feedback is about
+$comments: Comments on whatever the feedback is about
+"""
+    t.content="""Hi,
+
+Your input regarding $about has been received and registered.
+
+The following comments have been registered:
+
+--------------------------------------------------------------------------
+$comments
+--------------------------------------------------------------------------
+
+Thank you,
+"""
+    t.save()
+
+def reverse(apps, schema_migration):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    t = DBTemplate.objects.get(path='/nomcom/defaults/email/feedback_receipt.txt')
+    t.variables="""$nominee: Full name of the nominee
+$position: Nomination position
+$comments: Comments on this candidate
+"""
+    t.content="""Hi,
+
+Your input regarding $nominee for the position of
+$position has been received and registered.
+
+The following comments have been registered:
+
+--------------------------------------------------------------------------
+$comments
+--------------------------------------------------------------------------
+
+Thank you,
+"""
+    t.save()
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dbtemplate', '0005_add_default_topic_description'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/name/fixtures/names.json

@@ -2787,6 +2787,7 @@
       ],
       "desc": "Recipients when an interim meeting is announced",
       "to": [
+        "group_stream_announce",
         "ietf_announce"
       ]
     },
@@ -2813,6 +2814,7 @@
       ],
       "desc": "Recipients when an interim meeting is cancelled",
       "to": [
+        "group_stream_announce",
         "ietf_announce"
       ]
     },
@@ -6184,17 +6186,27 @@
       "desc": "Experimental room setup (boardroom and classroom) subject to availability",
       "name": "Boardroom Layout",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "boardroom"
   },
+  {
+    "fields": {
+      "desc": "Flipchars",
+      "name": "Flipcharts",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.roomresourcename",
+    "pk": "flipcharts"
+  },
   {
     "fields": {
       "desc": "The room will have a meetecho wrangler",
       "name": "Meetecho Support",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "meetecho"
@@ -6204,7 +6216,7 @@
       "desc": "The room will have a second computer projector",
       "name": "second LCD projector",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "proj2"
@@ -6214,11 +6226,21 @@
       "desc": "The room will have a computer projector",
       "name": "LCD projector",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "project"
   },
+  {
+    "fields": {
+      "desc": "Experimental Room Setup (U-Shape and classroom, subject to availability)",
+      "name": "Experimental Room Setup (U-Shape and classroom)",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.roomresourcename",
+    "pk": "u-shape"
+  },
   {
     "fields": {
       "desc": "",
@@ -6538,5 +6560,35 @@
     },
     "model": "name.timeslottypename",
     "pk": "unavail"
+  },
+  {
+    "fields": {
+      "desc": "Anyone who can log in",
+      "name": "General",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.topicaudiencename",
+    "pk": "general"
+  },
+  {
+    "fields": {
+      "desc": "Members of this nomcom",
+      "name": "Nomcom Members",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.topicaudiencename",
+    "pk": "nomcom"
+  },
+  {
+    "fields": {
+      "desc": "Anyone who has accepted a Nomination for an open position",
+      "name": "Nominees",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.topicaudiencename",
+    "pk": "nominees"
   }
 ]

ietf/name/migrations/0020_add_topics.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-05-24 08:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+def forward(apps, schema_editor):
+    TopicAudienceName = apps.get_model('name','TopicAudienceName')
+    # """General, Nominee, Nomcom Member"""
+    TopicAudienceName.objects.create(
+        slug='general',
+        name='General',
+        desc='Anyone who can log in',
+    )
+    TopicAudienceName.objects.create(
+        slug='nominees',
+        name='Nominees',
+        desc='Anyone who has accepted a Nomination for an open position',
+    )
+    TopicAudienceName.objects.create(
+        slug='nomcom',
+        name='Nomcom Members',
+        desc='Members of this nomcom',
+    )
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0019_add_docrelationshipname_downref_approval'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TopicAudienceName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.RunPython(forward,reverse),
+    ]

ietf/name/models.py

@@ -97,4 +97,5 @@ class ReviewResultName(NameModel):
     """Almost ready, Has issues, Has nits, Not Ready,
     On the right track, Ready, Ready with issues,
     Ready with nits, Serious Issues"""
-
+class TopicAudienceName(NameModel):
+    """General, Nominee, Nomcom Member"""

ietf/name/resources.py

@@ -14,7 +14,8 @@
     ConstraintName, MeetingTypeName, DocRelationshipName, RoomResourceName, IprLicenseTypeName,
     LiaisonStatementTagName, FeedbackTypeName, LiaisonStatementState, StreamName,
     BallotPositionName, DBTemplateTypeName, NomineePositionStateName,
-    ReviewRequestStateName, ReviewTypeName, ReviewResultName)
+    ReviewRequestStateName, ReviewTypeName, ReviewResultName,
+    TopicAudienceName, )
 
 
 class TimeSlotTypeNameResource(ModelResource):
@@ -456,3 +457,17 @@ class Meta:
         }
 api.name.register(ReviewResultNameResource())
 
+class TopicAudienceNameResource(ModelResource):
+    class Meta:
+        cache = SimpleCache()
+        queryset = TopicAudienceName.objects.all()
+        #resource_name = 'topicaudiencename'
+        filtering = { 
+            "slug": ALL,
+            "name": ALL,
+            "desc": ALL,
+            "used": ALL,
+            "order": ALL,
+        }
+api.name.register(TopicAudienceNameResource())
+

ietf/nomcom/factories.py

@@ -1,7 +1,7 @@
 import factory
 import random
 
-from ietf.nomcom.models import NomCom, Position, Feedback, Nominee, NomineePosition
+from ietf.nomcom.models import NomCom, Position, Feedback, Nominee, NomineePosition, Topic
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
 
@@ -122,6 +122,17 @@ def populate_personnel(obj, create, extracted, **kwargs): # pylint: disable=no-s
                 p = PersonFactory()
                 obj.group.role_set.create(name_id=role,person=p,email=p.email_set.first())
 
+    @factory.post_generation
+    def populate_topics(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
+        '''
+        Create a set of topics unless the factory is called with populate_topics=False
+        '''
+        if extracted is None:
+            extracted = True
+        if create and extracted:
+            for i in range(3):
+                TopicFactory(nomcom=obj)
+
 class PositionFactory(factory.DjangoModelFactory):
     class Meta:
         model = Position
@@ -155,3 +166,13 @@ class Meta:
     subject = factory.Faker('sentence')
     comments = factory.Faker('paragraph')
     type_id = 'comment'
+
+class TopicFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = Topic
+
+    nomcom = factory.SubFactory(NomComFactory)
+    subject = factory.Faker('sentence')
+    accepting_feedback = True
+    audience_id = 'general'
+