Merge in changes from the old shimfree branch

 - Legacy-Id: 6764

Author: OleLaursen

bin/mkdiagram

@@ -9,7 +9,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit
 if [ "$*" ]; then apps="$@"; graph="${1%.*}"; else apps=$(ls */models.py | sed 's!/models.py!!'); graph="models"; fi
 
 newapps="doc group meeting message person name"
-legacyapps="announcements idindex idrfc idtracker iesg ietfauth ietfworkflows ipr liaisons mailinglists proceedings redirects submit wgchairs wgcharter wginfo"
+legacyapps="announcements idindex idrfc idtracker iesg ietfauth ipr liaisons mailinglists proceedings redirects submit wgcharter wginfo"
 
 proxy="$(grep ^class */proxy.py | tr '()' '  ' | awk '{printf $2 ","}')"
 names="$(grep ^class name/models.py | tr '()' '  ' | awk '{printf $2 ","}')"

ietf/bin/expire-submissions

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import datetime, os
+import syslog
+
+from ietf import settings
+from django.core import management
+management.setup_environ(settings)
+
+syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
+
+from ietf.person.models import Person
+from ietf.submit.utils import expirable_submissions, expire_submission
+
+system = Person.objects.get(name="(System)")
+
+for sub in expirable_submissions(older_than_days=30):
+    expire_submission(sub, system)
+
+    syslog.syslog("Expired submission %s of %s-%s" % (sub.pk, sub.name, sub.rev))

ietf/bin/find-submission-confirmation-email-in-postfix-log

@@ -31,7 +31,7 @@ from django.conf import settings
 
 from ietf.utils.path import path as Path
 
-from ietf.submit.models import IdSubmissionDetail
+from ietf.submit.models import Submission
 from ietf.doc.models import Document
 
 
@@ -56,13 +56,13 @@ from_email = settings.IDSUBMIT_FROM_EMAIL
 if "<" in from_email:
     from_email = from_email.split("<")[1].split(">")[0]
 
-submission = IdSubmissionDetail.objects.filter(filename=draft).latest('submission_date')
+submission = Submission.objects.filter(name=draft).latest('submission_date')
 document = Document.objects.get(name=draft)
 emails = [ author.address for author in document.authors.all() ]
 
 timestrings = []
-for file in [ Path(settings.INTERNET_DRAFT_PATH) / ("%s-%s.txt"%(draft, submission.revision)),
-              Path(settings.IDSUBMIT_STAGING_PATH) / ("%s-%s.txt"%(draft, submission.revision)) ]:
+for file in [ Path(settings.INTERNET_DRAFT_PATH) / ("%s-%s.txt"%(draft, submission.rev)),
+              Path(settings.IDSUBMIT_STAGING_PATH) / ("%s-%s.txt"%(draft, submission.rev)) ]:
     if os.path.exists(file):
         upload_time = time.localtime(file.mtime)
         ts = time.strftime("%b %d %H:%M", upload_time)
@@ -95,4 +95,3 @@ for log in logfiles:
                     for qi in queue_ids:
                         if qi in line:
                             sys.stdout.write(line)
-                        

ietf/bin/test-crawl

@@ -24,7 +24,7 @@ connection.queries = DontSaveQueries()
 MAX_URL_LENGTH = 500
 SLOW_THRESHOLD = 1.0
 
-initial = ["/doc/all/", "/doc/in-last-call/"]
+initial = ["/doc/all/", "/doc/in-last-call/", "/iesg/decisions/"]
 
 visited = set()
 urls = {} # url -> referrer

ietf/community/display.py

@@ -3,7 +3,6 @@
 from django.db.models import Q
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.ietfworkflows.utils import get_state_for_draft
 from ietf.doc.models import DocAlias, DocEvent
 
 

ietf/doc/mails.py

@@ -9,7 +9,7 @@
 
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ipr.search import iprs_from_docs, related_docs
-from ietf.doc.models import WriteupDocEvent, BallotPositionDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent
+from ietf.doc.models import WriteupDocEvent, BallotPositionDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent, DocTagName
 from ietf.person.models import Person
 from ietf.group.models import Group, Role
 
@@ -413,3 +413,66 @@ def email_last_call_expired(doc):
                    doc=doc,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),
               cc="iesg-secretary@ietf.org")
+
+def stream_state_email_recipients(doc, extra_recipients=[]):
+    persons = set()
+    res = []
+    for r in Role.objects.filter(group=doc.group, name__in=("chair", "delegate")).select_related("person", "email"):
+        res.append(r.formatted_email())
+        persons.add(r.person)
+
+    for email in doc.authors.all():
+        if email.person not in persons:
+            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)
+
+    return res
+
+def email_draft_adopted(request, doc, by, comment):
+    recipients = stream_state_email_recipients(doc)
+    send_mail(request, recipients, settings.DEFAULT_FROM_EMAIL,
+              u"%s adopted in %s %s" % (doc.name, doc.group.acronym, doc.group.type.name),
+              'doc/mail/draft_adopted_email.txt',
+              dict(doc=doc,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                   by=by,
+                   comment=comment))
+
+def email_stream_state_changed(request, doc, prev_state, new_state, by, comment=""):
+    recipients = stream_state_email_recipients(doc)
+
+    state_type = (prev_state or new_state).type
+
+    send_mail(request, recipients, settings.DEFAULT_FROM_EMAIL,
+              u"%s changed for %s" % (state_type.label, doc.name),
+              'doc/mail/stream_state_changed_email.txt',
+              dict(doc=doc,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                   state_type=state_type,
+                   prev_state=prev_state,
+                   new_state=new_state,
+                   by=by,
+                   comment=comment))
+
+def email_stream_tags_changed(request, doc, added_tags, removed_tags, by, comment=""):
+    extra_recipients = []
+
+    if DocTagName.objects.get(slug="sheph-u") in added_tags and doc.shepherd:
+        extra_recipients.append(doc.shepherd)
+
+    recipients = stream_state_email_recipients(doc, extra_recipients)
+
+    send_mail(request, recipients, settings.DEFAULT_FROM_EMAIL,
+              u"Tags changed for %s" % doc.name,
+              'doc/mail/stream_tags_changed_email.txt',
+              dict(doc=doc,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                   added=added_tags,
+                   removed=removed_tags,
+                   by=by,
+                   comment=comment))