Manually moved the concepts forward. Reworked some presentation. Working enough to bring testers in at Sprint93

 - Legacy-Id: 9717

Author: rjsparks

ietf/doc/fields.py

@@ -4,6 +4,8 @@
 from django import forms
 from django.core.urlresolvers import reverse as urlreverse
 
+import debug                            # pyflakes:ignore
+
 from ietf.doc.models import Document, DocAlias
 from ietf.doc.utils import uppercase_std_abbreviated_name
 

ietf/doc/mails.py

@@ -488,3 +488,26 @@ def email_stream_tags_changed(request, doc, added_tags, removed_tags, by, commen
                    by=by,
                    comment=comment))
 
+def send_review_possibly_replaces_request(request, doc):
+    to_email = []
+
+    if doc.stream_id == "ietf":
+        to_email.extend(r.formatted_email() for r in Role.objects.filter(group=doc.group, name="chair").select_related("email", "person"))
+    elif doc.stream_id == "iab":
+        to_email.append("IAB Stream <iab-stream@iab.org>")
+    elif doc.stream_id == "ise":
+        to_email.append("Independent Submission Editor <rfc-ise@rfc-editor.org>")
+    elif doc.stream_id == "irtf":
+        to_email.append("IRSG <irsg@irtf.org>")
+
+    if not to_email:
+        to_email.append("internet-drafts@ietf.org")
+
+    if to_email:
+        send_mail(request, to_email, settings.DEFAULT_FROM_EMAIL,
+                  'Review of suggested possible replacements for %s-%s needed' % (doc.name, doc.rev),
+                  'doc/mail/review_possibly_replaces_request.txt', {
+                      'doc': doc,
+                      'possibly_replaces': doc.related_that_doc("possibly-replaces"),
+                      'review_url': settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name }),
+                  })

ietf/doc/models.py

@@ -654,6 +654,8 @@ class DocReminder(models.Model):
     ("completed_resurrect", "Completed resurrect"),
     ("changed_consensus", "Changed consensus"),
     ("published_rfc", "Published RFC"),
+    ("added_suggested_replaces", "Added suggested replacement relationships"),
+    ("reviewed_suggested_replaces", "Reviewed suggested replacement relationships"),
 
     # WG events
     ("changed_group", "Changed group"),

ietf/doc/tests_draft.py

@@ -11,7 +11,7 @@
 
 from ietf.doc.models import ( Document, DocAlias, DocReminder, DocumentAuthor, DocEvent,
     ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent, 
-    WriteupDocEvent, BallotDocEvent)
+    WriteupDocEvent, BallotDocEvent, DocRelationshipName)
 from ietf.doc.utils import get_tags_for_stream_id
 from ietf.name.models import StreamName, IntendedStdLevelName, DocTagName
 from ietf.group.models import Group
@@ -1255,11 +1255,14 @@ def test_change_replaces(self):
         self.assertEqual(len(q('[type=submit]:contains("Save")')), 1)
 
         # Post that says replacea replaces base a
+        RelatedDocument.objects.create(source=self.replacea, target=self.basea.docalias_set.first(),
+                                       relationship=DocRelationshipName.objects.get(slug="possibly-replaces"))
         self.assertEqual(self.basea.get_state().slug,'active')
         r = self.client.post(url, dict(replaces=str(DocAlias.objects.get(name=self.basea.name).id)))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(RelatedDocument.objects.filter(relationship__slug='replaces',source=self.replacea).count(),1) 
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl')
+        self.assertTrue(not RelatedDocument.objects.filter(relationship='possibly-replaces', source=self.replacea))
 
         # Post that says replaceboth replaces both base a and base b
         url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replaceboth.name))
@@ -1281,3 +1284,21 @@ def test_change_replaces(self):
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'active')
 
+    def test_review_possibly_replaces(self):
+        replaced = self.basea.docalias_set.first()
+        RelatedDocument.objects.create(source=self.replacea, target=replaced,
+                                       relationship=DocRelationshipName.objects.get(slug="possibly-replaces"))
+
+        url = urlreverse('doc_review_possibly_replaces', kwargs=dict(name=self.replacea.name))
+        login_testing_unauthorized(self, "secretary", url)
+
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form[name=review-suggested-replaces]')), 1)
+
+        r = self.client.post(url, dict(replaces=[replaced.pk]))
+        self.assertEquals(r.status_code, 302)
+        self.assertTrue(not self.replacea.related_that_doc("possibly-replaces"))
+        self.assertEqual(len(self.replacea.related_that_doc("replaces")), 1)
+        self.assertEquals(Document.objects.get(pk=self.basea.pk).get_state().slug, 'repl')

ietf/doc/urls.py

@@ -79,6 +79,7 @@
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/stream/$', views_draft.change_stream, name='doc_change_stream'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/replaces/$', views_draft.replaces, name='doc_change_replaces'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/notify/$', views_doc.edit_notify, name='doc_change_notify'),
+    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/suggested-replaces/$', views_draft.review_possibly_replaces, name='doc_review_possibly_replaces'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/status/$', views_draft.change_intention, name='doc_change_intended_status'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/telechat/$', views_doc.telechat_date, name='doc_change_telechat_date'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/iesgnote/$', views_draft.edit_iesg_note, name='doc_change_iesg_note'),

ietf/doc/utils.py

@@ -10,16 +10,15 @@
 from django.forms import ValidationError
 from django.utils.html import strip_tags, escape
 
-from ietf.utils import markup_txt
-from ietf.doc.models import Document, DocHistory
+from ietf.doc.models import Document, DocHistory, State
 from ietf.doc.models import DocAlias, RelatedDocument, BallotType, DocReminder
 from ietf.doc.models import DocEvent, BallotDocEvent, NewRevisionDocEvent, StateDocEvent
 from ietf.doc.models import save_document_in_history, STATUSCHANGE_RELATIONS
 from ietf.name.models import DocReminderTypeName, DocRelationshipName
 from ietf.group.models import Role
 from ietf.person.models import Email
 from ietf.ietfauth.utils import has_role
-from ietf.utils import draft
+from ietf.utils import draft, markup_txt
 from ietf.utils.mail import send_mail
 
 #FIXME - it would be better if this lived in ietf/doc/mails.py, but there's
@@ -314,9 +313,9 @@ def update_reminder(doc, reminder_type_slug, event, due_date):
             reminder.active = False
             reminder.save()
 
-def prettify_std_name(n):
+def prettify_std_name(n, spacing=" "):
     if re.match(r"(rfc|bcp|fyi|std)[0-9]+", n):
-        return n[:3].upper() + " " + n[3:]
+        return n[:3].upper() + spacing + n[3:]
     else:
         return n
 
@@ -459,6 +458,75 @@ def rebuild_reference_relations(doc,filename=None):
 
     return ret
 
+def collect_email_addresses(emails, doc):
+    for author in doc.authors.all():
+        if author.address not in emails:
+            emails[author.address] = '"%s"' % (author.person.name)
+    if doc.group and doc.group.acronym != 'none':
+        for role in doc.group.role_set.filter(name='chair'):
+            if role.email.address not in emails:
+                emails[role.email.address] = '"%s"' % (role.person.name)
+        if doc.group.type.slug == 'wg':
+            address = '%s-ads@tools.ietf.org' % doc.group.acronym
+            if address not in emails:
+                emails[address] = '"%s-ads"' % (doc.group.acronym)
+        elif doc.group.type.slug == 'rg':
+            for role in doc.group.parent.role_set.filter(name='chair'):
+                if role.email.address not in emails:
+                    emails[role.email.address] = '"%s"' % (role.person.name)
+    if doc.shepherd and doc.shepherd.address not in emails:
+        emails[doc.shepherd.address] = u'"%s"' % (doc.shepherd.person.name or "")
+
+def set_replaces_for_document(request, doc, new_replaces, by, email_subject, email_comment=""):
+    emails = {}
+    collect_email_addresses(emails, doc)
+
+    relationship = DocRelationshipName.objects.get(slug='replaces')
+    old_replaces = doc.related_that_doc("replaces")
+
+    for d in old_replaces:
+        if d not in new_replaces:
+            collect_email_addresses(emails, d.document)
+            RelatedDocument.objects.filter(source=doc, target=d, relationship=relationship).delete()
+            if not RelatedDocument.objects.filter(target=d, relationship=relationship):
+                s = 'active' if d.document.expires > datetime.datetime.now() else 'expired'
+                d.document.set_state(State.objects.get(type='draft', slug=s))
+
+    for d in new_replaces:
+        if d not in old_replaces:
+            collect_email_addresses(emails, d.document)
+            RelatedDocument.objects.create(source=doc, target=d, relationship=relationship)
+            d.document.set_state(State.objects.get(type='draft', slug='repl'))
+
+    e = DocEvent(doc=doc, by=by, type='changed_document')
+    new_replaces_names = u", ".join(d.name for d in new_replaces) or u"None"
+    old_replaces_names = u", ".join(d.name for d in old_replaces) or u"None"
+    e.desc = u"This document now replaces <b>%s</b> instead of %s" % (new_replaces_names, old_replaces_names)
+    e.save()
+
+    # make sure there are no lingering suggestions duplicating new replacements
+    RelatedDocument.objects.filter(source=doc, target__in=new_replaces, relationship="possibly-replaces").delete()
+
+    email_desc = e.desc.replace(", ", "\n    ")
+
+    if email_comment:
+        email_desc += "\n" + email_comment
+
+    to = [
+        u'%s <%s>' % (emails[email], email) if emails[email] else u'<%s>' % email
+        for email in sorted(emails)
+    ]
+
+    from ietf.doc.mails import html_to_text
+
+    send_mail(request, to,
+              "DraftTracker Mail System <iesg-secretary@ietf.org>",
+              email_subject,
+              "doc/mail/change_notice.txt",
+              dict(text=html_to_text(email_desc),
+                   doc=doc,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
+
 def check_common_doc_name_rules(name):
     """Check common rules for document names for use in forms, throws
     ValidationError in case there's a problem."""

ietf/doc/views_doc.py

@@ -345,6 +345,8 @@ def document_main(request, name, rev=None):
 
         replaces = [d.name for d in doc.related_that_doc("replaces")]
         replaced_by = [d.name for d in doc.related_that("replaces")]
+        possibly_replaces = [d.name for d in doc.related_that_doc("possibly-replaces")]
+        possibly_replaced_by = [d.name for d in doc.related_that("possibly-replaces")]
         published = doc.latest_event(type="published_rfc")
         started_iesg_process = doc.latest_event(type="started_iesg_process")
 
@@ -355,6 +357,8 @@ def document_main(request, name, rev=None):
         table_rows = dict(doc=4, stream=2, iesg=4, iana=2, rfced=1)
         table_rows['doc'] += 1 if replaces or can_edit_stream_info else 0
         table_rows['doc'] += 1 if replaced_by  else 0
+        table_rows['doc'] += 1 if possibly_replaces  else 0
+        table_rows['doc'] += 1 if possibly_replaced_by  else 0
         table_rows['doc'] += 1 if doc.get_state_slug() != "rfc" else 0
         table_rows['doc'] += 1 if conflict_reviews else 0
 
@@ -396,6 +400,8 @@ def document_main(request, name, rev=None):
 
                                        replaces=replaces,
                                        replaced_by=replaced_by,
+                                       possibly_replaces=possibly_replaces,
+                                       possibly_replaced_by=possibly_replaced_by,
                                        updates=[prettify_std_name(d.name) for d in doc.related_that_doc("updates")],
                                        updated_by=[prettify_std_name(d.document.canonical_name()) for d in doc.related_that("updates")],
                                        obsoletes=[prettify_std_name(d.name) for d in doc.related_that_doc("obs")],