Merged in branch/iola/people-cleanup @ [8471] from olau@iola.dk, which

  enhances a number of pages in the datatracker where forms contain fields
  where a person should be chosen, such as for instance when choosing the
  shepherd of a document, so that they uniformly display choices which show
  both email address and name.

  Furthermore, changes have been made so as to make the email address
  uniformly act as reference to the person record.  

  Autocompletion is now consistently provided when looking for the email
  address or name of the person to choose.  

  This solves a number of issues where it has been difficult to choose the
  correct Person/Email combination, and where the correct email address to use
  for an association has been unavailable previously.
 - Legacy-Id: 8472
Note: SVN reference [8471] has been migrated to Git commit d62f234

Author: levkowetz

changelog

@@ -15,7 +15,7 @@ ietfdb (5.7.0) ietf; urgency=medium
   correct Person/Email combination, and where the correct email address to use
   for an association has been unavailable previously.
 
- -- Henrik Levkowetz <henrik@levkowetz.com>  25 Oct 2014 13:53:37 -0700
+ -- Henrik Levkowetz <henrik@levkowetz.com>  25 Oct 2014 13:49:49 -0200
 
 ietfdb (5.6.5) ietf; urgency=medium
 

ietf/community/rules.py

@@ -89,7 +89,7 @@ class ShepherdRule(RuleManager):
     description = 'All I-Ds with a particular document shepherd'
 
     def get_documents(self):
-        return Document.objects.filter(type='draft', states__slug='active').filter(shepherd__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft', states__slug='active').filter(shepherd__person__name__icontains=self.value).distinct()
 
 
 # class ReferenceToRFCRule(RuleManager):

ietf/doc/mails.py

@@ -32,9 +32,9 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""):
 
     # These use comprehension to deal with conditions when there might be more than one chair listed for a stream
     if old_stream:
-        to.extend([x.person.formatted_email() for x in Role.objects.filter(group__acronym=old_stream.slug,name='chair')])
+        to.extend([r.formatted_email() for r in Role.objects.filter(group__acronym=old_stream.slug, name='chair')])
     if new_stream:
-        to.extend([x.person.formatted_email() for x in Role.objects.filter(group__acronym=new_stream.slug,name='chair')])
+        to.extend([r.formatted_email() for r in Role.objects.filter(group__acronym=new_stream.slug, name='chair')])
 
     if not to:
         return
@@ -443,10 +443,10 @@ def stream_state_email_recipients(doc, extra_recipients=[]):
             res.append(email.formatted_email())
             persons.add(email.person)
 
-    for p in extra_recipients:
-        if not p in persons:
-            res.append(p.formatted_email())
-            persons.add(p)
+    for e in extra_recipients:
+        if e.person not in persons:
+            res.append(e.formatted_email())
+            persons.add(e.person)
 
     return res
 

ietf/doc/migrations/0021_auto__add_field_document_shepherd_email__add_field_dochistory_shepherd.py

@@ -64,7 +64,7 @@ class DocumentInfo(models.Model):
     intended_std_level = models.ForeignKey(IntendedStdLevelName, verbose_name="Intended standardization level", blank=True, null=True)
     std_level = models.ForeignKey(StdLevelName, verbose_name="Standardization level", blank=True, null=True)
     ad = models.ForeignKey(Person, verbose_name="area director", related_name='ad_%(class)s_set', blank=True, null=True)
-    shepherd = models.ForeignKey(Person, related_name='shepherd_%(class)s_set', blank=True, null=True)
+    shepherd = models.ForeignKey(Email, related_name='shepherd_%(class)s_set', blank=True, null=True)
     expires = models.DateTimeField(blank=True, null=True)
     notify = models.CharField(max_length=255, blank=True)
     external_url = models.URLField(blank=True) # Should be set for documents with type 'External'.

ietf/doc/migrations/0022_fill_in_shepherd_email.py

@@ -819,6 +819,9 @@ def test_doc_change_ad(self):
         self.assertTrue(self.doc.latest_event(DocEvent,type="added_comment").desc.startswith('Shepherding AD changed'))
 
     def test_doc_change_shepherd(self):
+        self.doc.shepherd = None
+        self.doc.save()
+
         url = urlreverse('doc_edit_shepherd',kwargs=dict(name=self.docname))
 
         login_testing_unauthorized(self, "plain", url)
@@ -835,23 +838,51 @@ def test_doc_change_shepherd(self):
         self.assertEqual(len(q('form input[id=id_shepherd]')),1)
 
         # change the shepherd
-        plain = Person.objects.get(name='Plain Man')
-        plain_email = plain.email_set.all()[0]
-        r = self.client.post(url,dict(shepherd=plain_email))
+        plain_email = Email.objects.get(person__name="Plain Man")
+        r = self.client.post(url, dict(shepherd=plain_email.pk))
         self.assertEqual(r.status_code,302)
         self.doc = Document.objects.get(name=self.docname)
-        self.assertEqual(self.doc.shepherd,plain)
+        self.assertEqual(self.doc.shepherd, plain_email)
         comments = '::'.join([x.desc for x in self.doc.docevent_set.filter(time=self.doc.time,type="added_comment")])
         self.assertTrue('Document shepherd changed to Plain Man' in comments)
         self.assertTrue('Notification list changed' in comments)
 
+        # test buggy change
         ad = Person.objects.get(name='Aread Irector')
         two_answers = "%s,%s" % (plain_email, ad.email_set.all()[0])
-        r = self.client.post(url,(dict(shepherd=two_answers)))
-        self.assertEqual(r.status_code,200)
+        r = self.client.post(url, dict(shepherd=two_answers))
+        self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(len(q('form ul.errorlist')) > 0)
 
+    def test_doc_change_shepherd_email(self):
+        self.doc.shepherd = None
+        self.doc.save()
+
+        url = urlreverse('doc_change_shepherd_email',kwargs=dict(name=self.docname))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        self.doc.shepherd = Email.objects.get(person__user__username="ad1")
+        self.doc.save()
+
+        login_testing_unauthorized(self, "plain", url)
+
+        self.doc.shepherd = Email.objects.get(person__user__username="plain")
+        self.doc.save()
+
+        new_email = Email.objects.create(address="anotheremail@example.com", person=self.doc.shepherd.person)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        # change the shepherd email
+        r = self.client.post(url, dict(shepherd=new_email))
+        self.assertEqual(r.status_code, 302)
+        self.doc = Document.objects.get(name=self.docname)
+        self.assertEqual(self.doc.shepherd, new_email)
+        self.assertTrue(self.doc.latest_event(DocEvent, type="added_comment").desc.startswith('Document shepherd email changed'))
+
     def test_doc_view_shepherd_writeup(self):
         url = urlreverse('doc_shepherd_writeup',kwargs=dict(name=self.docname))
 

ietf/doc/migrations/0023_auto__del_field_document_shepherd__rename_shepherd_email.py

@@ -81,6 +81,7 @@
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/ad/$', views_draft.edit_ad, name='doc_change_ad'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/consensus/$', views_draft.edit_consensus, name='doc_edit_consensus'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherd/$', views_draft.edit_shepherd, name='doc_edit_shepherd'),
+    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherdemail/$', views_draft.change_shepherd_email, name='doc_change_shepherd_email'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/shepherdwriteup/$', views_draft.edit_shepherd_writeup, name='doc_edit_shepherd_writeup'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/requestpublication/$', views_draft.request_publication, name='doc_request_publication'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/adopt/$', views_draft.adopt_draft, name='doc_adopt_draft'),

ietf/doc/models.py

@@ -366,7 +366,7 @@ def start_review_sanity_check(request, name):
 def build_notify_addresses(doc_to_review):
     # Take care to do the right thing during ietf chair and stream owner transitions
     notify_addresses = []
-    notify_addresses.extend([x.person.formatted_email() for x in Role.objects.filter(group__acronym=doc_to_review.stream.slug,name='chair')])
+    notify_addresses.extend([r.formatted_email() for r in Role.objects.filter(group__acronym=doc_to_review.stream.slug, name='chair')])
     notify_addresses.append("%s@%s" % (doc_to_review.name, settings.TOOLS_SERVER))
     return notify_addresses