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

    This set of changes focuses on improvements to the nomcom portion of
    the datatracker. 

    These changes:

    - Simplify the nomcom form for comments. Make it more obvious who
      receives mail when a comment is supplied. Fixes ietf-tools#1849.

    - Simplify the nomcom form for nominations. Provide a primary workflow
      where nominations choose an existing Person, and a secondary
      workflow for nominating new people. 

    - Allow nominees to add a comment when accepting or declining a
      nomination. Fixes ietf-tools#1845.

    - Organize the list of nominees on the feedback page. Fixes ietf-tools#1786 and
      ietf-tools#1809.

    - Simplify the mechanisms used to display feedback message counts.

    - Regroup the feedback view to make it easier to see where to spend
      review effort. Fixes ietf-tools#1866.

    - Capture when nomcom members last reviewed feedback for a given
      nominee. Add badges when new feedback is avaliable. Improve the
      layout of the feedback index page. Fixes ietf-tools#1850.

    - Reorganize the tab navigation on the nomcom private pages. Made it
      more obvious when the chair is doing something that only the chair
      gets to see. Fixes ietf-tools#1788 and ietf-tools#1795.

    - Regroup multiselect options to make classifying pending feedback
      simpler. Make the control larger and resizable. Fixes ietf-tools#1495.

    - Simplify the chair's views for editing nominee records. Replace the
      merge nominee form with a request to the secretariat to merge Person
      records. Fixes ietf-tools#1847. 

    - Added merging nominees to the secretariat's persson merging script. 

    - Show information for concluded nomcoms. Close feedback and
      nomination for concluded nomcoms. Fixes ietf-tools#1856.

    - Improve the questionnaire templates, reminding the nominee that
      receiving the questionnaire does not imply they have accepted a
      nomination. Fixes ietf-tools#1807.

    - Remove the description field from Postion. Simplify the Position
      list and the Position edit form. Make the nomcom pages more self
      documenting. Add a page to help nomcom chiars through setting up a
      new nomcom. Fixes ietf-tools#1867 and ietf-tools#1768.

    - Remove the type from the template pathname for the requirements
      templates. Make the requirements views work for both types plain and
      rst. Changed the default type for new nomcom requirement templates
      to rst.

    - Remove 'incumbent' from the models. Fixes ietf-tools#1771.

    - Adjust the models for Nominee and Nomination to better associate
      Nominee objects with Person objects.

    - Remove BaseNomcomForm and the implementation of custom fieldsets.

    - Replace the custom message framework with the django provided
      messages framework.

    - Improve SearchablePersonField to show the primary email address for
      any search result where a name appears more than once.

    - Add the use of factory-boy for generating test data. Normalize
      management of a test directory for test nomcom public keys.
      Significantly improve test coverage of the nomcom related code.
 - Legacy-Id: 10703
Note: SVN reference [10629] has been migrated to Git commit c8bbfba

Author: levkowetz

ietf/bin/merge-person-records

@@ -12,11 +12,10 @@ import django
 django.setup()
 
 import argparse
-import pprint
-from django.contrib import admin
-from django.contrib.auth.models import User
 from ietf.person.models import Person
 
+from ietf.person.utils import merge_persons
+
 parser = argparse.ArgumentParser()
 parser.add_argument("source_id",type=int)
 parser.add_argument("target_id",type=int)
@@ -30,62 +29,4 @@ response = raw_input('Ok to continue y/n? ')
 if response.lower() != 'y':
     sys.exit()
 
-# merge emails
-for email in source.email_set.all():
-    print "Merging email: {}".format(email.address)
-    email.person = target
-    email.save()
-
-# merge aliases
-target_aliases = [ a.name for a in target.alias_set.all() ]
-for alias in source.alias_set.all():
-    if alias.name in target_aliases:
-        alias.delete()
-    else:
-        print "Merging alias: {}".format(alias.name)
-        alias.person = target
-        alias.save()
-
-# merge DocEvents
-for docevent in source.docevent_set.all():
-    docevent.by = target
-    docevent.save()
-    
-# merge SubmissionEvents
-for subevent in source.submissionevent_set.all():
-    subevent.by = target
-    subevent.save()
-
-# merge Messages
-for message in source.message_set.all():
-    message.by = target
-    message.save()
-
-# merge Constraints
-for constraint in source.constraint_set.all():
-    constraint.person = target
-    constraint.save()
-
-# merge Roles
-for role in source.role_set.all():
-    role.person = target
-    role.save()
-
-# check for any remaining relationships and delete if none
-objs = [source]
-opts = Person._meta
-user = User.objects.filter(is_superuser=True).first()
-admin_site = admin.site
-using = 'default'
-
-deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
-    objs, opts, user, admin_site, using)
-    
-if len(deletable_objects) > 1:
-    print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
-    print "Related objects remain:"
-    pprint.pprint(deletable_objects[1])
-
-else:
-    print "Deleting Person: {}({})".format(source.ascii,source.pk)
-    source.delete()
+merge_persons(source,target,sys.stdout)

ietf/dbtemplate/factories.py

@@ -0,0 +1,8 @@
+import factory
+
+from ietf.dbtemplate.models import DBTemplate
+
+class DBTemplateFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = DBTemplate
+

ietf/dbtemplate/fixtures/nomcom_templates.xml

@@ -76,10 +76,10 @@ Questionnaire</field>
         <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
     </object>
     <object pk="6" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/position/requirements.txt</field>
+        <field type="CharField" name="path">/nomcom/defaults/position/requirements</field>
         <field type="CharField" name="title">Position requirements</field>
         <field type="TextField" name="variables">$position: Position</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
         <field type="TextField" name="content">These are the requirements for the position $position:
 
 Requirements.</field>

ietf/dbtemplate/templates/dbtemplate/template_show.html

@@ -0,0 +1,40 @@
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
+
+{% block content %}
+<h1>Template: {{ template }}</h1>
+
+<h2>Meta information</h2>
+<dl>
+  <dt>Title</dt>
+  <dd>{{ template.title }}</dt>
+  <dt>Group</dt>
+  <dd>{{ template.group }}</dd>
+  <dt>Template type</dt>
+  <dd>{{ template.type.name }}
+  {% if template.type.slug == "rst" %}
+  <p class="help-block">This template uses the syntax of reStructuredText. Get a quick reference at <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">http://docutils.sourceforge.net/docs/user/rst/quickref.html</a>.</p>
+  <p class="help-block">You can do variable interpolation with $varialbe if the template allows any variable.</p>
+  {% endif %}
+  {% if template.type.slug == "django" %}
+  <p class="help-block">This template uses the syntax of the default django template framework. Get more info at <a href="https://docs.djangoproject.com/en/dev/topics/templates/">https://docs.djangoproject.com/en/dev/topics/templates/</a>.</p>
+  <p class="help-block">You can do variable interpolation with the current django markup &#123;&#123;variable&#125;&#125; if the template allows any variable.</p>
+  {% endif %}
+  {% if template.type.slug == "plain" %}
+  <p class="help-block">This template uses plain text, so no markup is used. You can do variable interpolation with $variable if the template allows any variable.</p>
+  {% endif %}
+  </dd>
+  {% if template.variables %}
+  <dt>Variables allowed in this template</dt>
+  <dd>{{ template.variables|linebreaks }}</dd>
+  {% endif %}
+</dl>
+
+<h2>Template content</h2>
+
+  <div class = "panel panel-default">
+    <p class='pasted'>{{ template.content }}</p>
+  </div>
+
+{% endblock content %}

ietf/dbtemplate/views.py

@@ -43,3 +43,19 @@ def template_edit(request, acronym, template_id, base_template='dbtemplate/templ
     }
     context.update(extra_context)
     return render(request, base_template, context)
+
+def template_show(request, acronym, template_id, base_template='dbtemplate/template_edit.html', extra_context=None):
+    group = get_object_or_404(Group, acronym=acronym)
+    chairs = group.role_set.filter(name__slug='chair')
+    extra_context = extra_context or {}
+
+    if not has_role(request.user, "Secretariat") and not chairs.filter(person__user=request.user).count():
+        return HttpResponseForbidden("You are not authorized to access this view")
+
+    template = get_object_or_404(DBTemplate, id=template_id, group=group)
+
+    context = {'template': template,
+        'group': group,
+    }
+    context.update(extra_context)
+    return render(request, base_template, context)

ietf/doc/tests_draft.py

@@ -1309,6 +1309,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.basea.documentauthor_set.create(author=Email.objects.create(address="basea_author@example.com"),order=1)
 
         self.baseb = Document.objects.create(
             name="draft-test-base-b",
@@ -1319,6 +1320,7 @@ def setUp(self):
             expires=datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.baseb.documentauthor_set.create(author=Email.objects.create(address="baseb_author@example.com"),order=1)
 
         self.replacea = Document.objects.create(
             name="draft-test-replace-a",
@@ -1329,6 +1331,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.replacea.documentauthor_set.create(author=Email.objects.create(address="replacea_author@example.com"),order=1)
 
         self.replaceboth = Document.objects.create(
             name="draft-test-replace-both",
@@ -1339,6 +1342,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.replaceboth.documentauthor_set.create(author=Email.objects.create(address="replaceboth_author@example.com"),order=1)
 
         self.basea.set_state(State.objects.get(used=True, type="draft", slug="active"))
         self.baseb.set_state(State.objects.get(used=True, type="draft", slug="expired"))
@@ -1373,8 +1377,8 @@ def test_change_replaces(self):
         self.assertTrue(not RelatedDocument.objects.filter(relationship='possibly-replaces', source=self.replacea))
         self.assertEqual(len(outbox), 1)
         self.assertTrue('replacement status updated' in outbox[-1]['Subject'])
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('replace-a@' in outbox[-1]['To'])
+        self.assertTrue('replacea_author@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
 
         empty_outbox()
         # Post that says replaceboth replaces both base a and base b
@@ -1385,9 +1389,9 @@ def test_change_replaces(self):
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl')
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'repl')
         self.assertEqual(len(outbox), 1)
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('base-b@' in outbox[-1]['To'])
-        self.assertTrue('replace-both@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('baseb_author@' in outbox[-1]['To'])
+        self.assertTrue('replaceboth_author@' in outbox[-1]['To'])
 
         # Post that undoes replaceboth
         empty_outbox()
@@ -1396,18 +1400,18 @@ def test_change_replaces(self):
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl') # Because A is still also replaced by replacea
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'expired')
         self.assertEqual(len(outbox), 1)
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('base-b@' in outbox[-1]['To'])
-        self.assertTrue('replace-both@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('baseb_author@' in outbox[-1]['To'])
+        self.assertTrue('replaceboth_author@' in outbox[-1]['To'])
 
         # Post that undoes replacea
         empty_outbox()
         url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replacea.name))
         r = self.client.post(url, dict(replaces=""))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'active')
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('replace-a@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('replacea_author@' in outbox[-1]['To'])
 
 
     def test_review_possibly_replaces(self):

ietf/doc/utils.py

@@ -21,6 +21,8 @@
 from ietf.utils.mail import send_mail
 from ietf.mailtrigger.utils import gather_address_lists
 
+import debug              # pyflakes:ignore
+
 #TODO FIXME - it would be better if this lived in ietf/doc/mails.py, but there's
 #        an import order issue to work out.
 def email_update_telechat(request, doc, text):

ietf/group/factories.py

@@ -0,0 +1,10 @@
+import factory
+
+from ietf.group.models import Group
+
+class GroupFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = Group
+
+    name = factory.Faker('sentence',nb_words=6)
+    acronym = factory.Faker('word')

ietf/ietfauth/utils.py

@@ -64,9 +64,9 @@ def has_role(user, role_names, *args, **kwargs):
 	    "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]),
             "AG Secretary": Q(person=person,name="secr", group__type="ag", group__state__in=["active"]),
             "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
-            "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
-            "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
-            "Nomcom": Q(person=person, group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
+            "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
+            "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
+            "Nomcom": Q(person=person, group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
             "Liaison Manager": Q(person=person,name="liaiman",group__type="sdo",group__state="active", ),
             "Authorized Individual": Q(person=person,name="auth",group__type="sdo",group__state="active", ),
             }

ietf/mailtrigger/migrations/0003_merge_request_trigger.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+
+    Recipient=apps.get_model('mailtrigger','Recipient')
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+
+    m = MailTrigger.objects.create(
+            slug='person_merge_requested',
+            desc="Recipients for a message requesting that duplicated Person records be merged ")
+    m.to = Recipient.objects.filter(slug__in=['ietf_secretariat', ])
+
+def reverse(apps, schema_editor):
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+    MailTrigger.objects.filter(slug='person_merge_requested').delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0002_auto_20150809_1314'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]