Merged django18 work forward to r12447

 - Legacy-Id: 12455

Author: levkowetz

ietf/dbtemplate/template.py

@@ -4,7 +4,7 @@
 from docutils.utils import SystemMessage
 import debug                            # pyflakes:ignore
 
-from django.template import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError
+from django.template.base import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError
 from django.template.loader import BaseLoader
 from django.utils.encoding import smart_unicode
 

ietf/doc/models.py

@@ -3,6 +3,7 @@
 import datetime, os
 
 from django.db import models
+from django.core import checks
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse as urlreverse
 from django.core.validators import URLValidator
@@ -26,6 +27,20 @@ class StateType(models.Model):
     def __unicode__(self):
         return self.slug
 
+@checks.register('db-consistency')
+def check_statetype_slugs(app_configs, **kwargs):
+    errors = []
+    state_type_slugs = [ t.slug for t in StateType.objects.all() ]
+    for type in DocTypeName.objects.all():
+        if not type.slug in state_type_slugs:
+            errors.append(checks.Error(
+                "The document type '%s (%s)' does not have a corresponding entry in the doc.StateType table" % (type.name, type.slug),
+                hint="You should add a doc.StateType entry with a slug '%s' to match the DocTypeName slug."%(type.slug),
+                obj=type,
+                id='datatracker.doc.E0015',
+            ))
+    return errors
+
 class State(models.Model):
     type = models.ForeignKey(StateType)
     slug = models.SlugField()
@@ -53,7 +68,7 @@ class DocumentInfo(models.Model):
     title = models.CharField(max_length=255)
 
     states = models.ManyToManyField(State, blank=True) # plain state (Active/Expired/...), IESG state, stream state
-    tags = models.ManyToManyField(DocTagName, blank=True, null=True) # Revised ID Needed, ExternalParty, AD Followup, ...
+    tags = models.ManyToManyField(DocTagName, blank=True) # Revised ID Needed, ExternalParty, AD Followup, ...
     stream = models.ForeignKey(StreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission
     group = models.ForeignKey(Group, blank=True, null=True) # WG, RG, IAB, IESG, Edu, Tools
 
@@ -277,7 +292,7 @@ def relations_that(self, relationship):
         if isinstance(self, Document):
             return RelatedDocument.objects.filter(target__document=self, relationship__in=relationship).select_related('source')
         elif isinstance(self, DocHistory):
-            return RelatedDocHistory.objects.filter(target__document=self, relationship__in=relationship).select_related('source')
+            return RelatedDocHistory.objects.filter(target__document=self.doc, relationship__in=relationship).select_related('source')
         else:
             return RelatedDocument.objects.none()
 

ietf/doc/templatetags/ietf_filters.py

@@ -13,7 +13,7 @@
 from ietf.doc.utils import get_document_content
 from django import template
 from django.conf import settings
-from django.utils.html import escape, fix_ampersands
+from django.utils.html import escape
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags, urlize
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
@@ -69,7 +69,7 @@ def parse_email_list(value):
             (name, email) = parseaddr(addr)
             if not(name):
                 name = email
-            ret.append('<a href="mailto:%s">%s</a>' % ( fix_ampersands(email), escape(name) ))
+            ret.append('<a href="mailto:%s">%s</a>' % ( email.replace('&', '&amp;'), escape(name) ))
         return mark_safe(", ".join(ret))
     else:
         return value

ietf/doc/utils_search.py

@@ -12,7 +12,7 @@ def fill_in_document_table_attributes(docs):
     docs_dict = dict((d.pk, d) for d in docs)
     doc_ids = docs_dict.keys()
 
-    rfc_aliases = dict(DocAlias.objects.filter(name__startswith="rfc", document__in=doc_ids).values_list("document_id", "name"))
+    rfc_aliases = dict(DocAlias.objects.filter(name__startswith="rfc", document__in=doc_ids).values_list("document", "name"))
 
     # latest event cache
     event_types = ("published_rfc",
@@ -79,9 +79,9 @@ def fill_in_document_table_attributes(docs):
         d.updated_by_list = []
 
     xed_by = RelatedDocument.objects.filter(target__name__in=rfc_aliases.values(),
-                                            relationship__in=("obs", "updates")).select_related('target__document_id')
+                                            relationship__in=("obs", "updates")).select_related('target__document')
     rel_rfc_aliases = dict(DocAlias.objects.filter(name__startswith="rfc",
-                                                   document__in=[rel.source_id for rel in xed_by]).values_list('document_id', 'name'))
+                                                   document__in=[rel.source_id for rel in xed_by]).values_list('document', 'name'))
     for rel in xed_by:
         d = docs_dict[rel.target.document_id]
         if rel.relationship_id == "obs":
@@ -101,7 +101,7 @@ def prepare_document_table(request, docs, query=None, max_results=500):
     if not isinstance(docs, list):
         # evaluate and fill in attribute results immediately to decrease
         # the number of queries
-        docs = docs.select_related("ad", "ad__person", "std_level", "intended_std_level", "group", "stream")
+        docs = docs.select_related("ad", "std_level", "intended_std_level", "group", "stream")
         docs = docs.prefetch_related("states__type", "tags", "groupmilestone_set__group", "reviewrequest_set__team")
 
     docs = list(docs[:max_results])

ietf/doc/views_material.py

@@ -38,7 +38,7 @@ class UploadMaterialForm(forms.Form):
     def __init__(self, doc_type, action, group, doc, *args, **kwargs):
         super(UploadMaterialForm, self).__init__(*args, **kwargs)
 
-        self.fields["state"].queryset = self.fields["state"].queryset.filter(type=doc_type)
+        self.fields["state"].queryset = self.fields["state"].queryset.filter(type__slug=doc_type.slug)
 
         self.doc_type = doc_type
         self.action = action

ietf/liaisons/models.py

@@ -40,7 +40,7 @@ class LiaisonStatement(models.Model):
     other_identifiers = models.TextField(blank=True, null=True) # Identifiers from other bodies
     body = models.TextField(blank=True)
 
-    tags = models.ManyToManyField(LiaisonStatementTagName, blank=True, null=True)
+    tags = models.ManyToManyField(LiaisonStatementTagName, blank=True)
     attachments = models.ManyToManyField(Document, through='LiaisonStatementAttachment', blank=True)
     state = models.ForeignKey(LiaisonStatementState, default='pending')
 
@@ -212,7 +212,7 @@ def __unicode__(self):
 
 
 class LiaisonStatementGroupContacts(models.Model):
-    group = models.ForeignKey(Group, unique=True)
+    group = models.ForeignKey(Group, unique=True, null=True)
     contacts = models.CharField(max_length=255,blank=True)
     cc_contacts = models.CharField(max_length=255,blank=True)
 

ietf/mailtrigger/models.py

@@ -22,8 +22,8 @@ def clean_duplicates(addrlist):
 class MailTrigger(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
-    to   = models.ManyToManyField('Recipient', null=True, blank=True, related_name='used_in_to')
-    cc   = models.ManyToManyField('Recipient', null=True, blank=True, related_name='used_in_cc')
+    to   = models.ManyToManyField('Recipient', blank=True, related_name='used_in_to')
+    cc   = models.ManyToManyField('Recipient', blank=True, related_name='used_in_cc')
 
     class Meta:
         ordering = ["slug"]

ietf/meeting/fixtures/proceedings_templates.json

@@ -0,0 +1,65 @@
+[
+  {
+    "fields": {
+      "group": 1,
+      "title": "IETF 97 Proceedings Overview",
+      "variables": null,
+      "content": "The Internet Engineering Task Force (IETF) provides a forum for working groups to coordinate technical development of new protocols. Its most important function is the development and selection of standards within the Internet protocol suite.\n\nThe IETF began in January 1986 as a forum for technical coordination by contractors for the then US Defense Advanced Research Projects Agency (DARPA), working on the ARPANET, US Defense Data Network (DDN), and the Internet core gateway system. Since that time, the IETF has grown into a large open international community of network designers, operators, vendors, and researchers concerned with the evolution of the Internet architecture and the smooth operation of the Internet.\n\nThe IETF mission includes:\n\n* Identifying and proposing solutions to pressing operational and technical problems in the Internet\n* Specifying the development or usage of protocols and the near-term architecture, to solve technical problems for the Internet\n* Facilitating technology transfer from the Internet Research Task Force (IRTF) to the wider Internet community;and\n* Providing a forum for the exchange of relevant information within the Internet community between vendors, users, researchers, agency contractors, and network managers.\n\nTechnical activities in the IETF are addressed within working groups. All working groups are organized roughly by function into seven areas. Each area is led by one or more Area Directors who have primary responsibility for that one area of IETF activity. Together with the Chair of the IETF/IESG, these Area Directors comprise the Internet Engineering Steering Group (IESG).\n\n===================  ===================================  ========================\nName                 Area                                 Email\n===================  ===================================  ========================\nJari Arkko           IETF Chair                           chair@ietf.org\nJari Arkko           General Area                         jari.arkko@piuha.net\nAlia Atlas           Routing Area                         akatlas@gmail.com\nDeborah Brungard     Routing Areas                        db3546@att.com\nBen Campbell         Applications and Real-Time Area      ben@nostrum.com\nBenoit Claise        Operations and Management Area       bclaise@cisco.com\nAlissa Cooper        Applications and Real-Time Area      alissa@cooperw.in\nSpencer Dawkins      Transport Area                       spencerdawkins.ietf@gmail.com\nStephen Farrell      Security Area                        stephen.farrell@cs.tcd.ie\nJoel Jaeggli         Operations and Management Area       joelja@bogus.com\nSuresh Krishnan      Internet Area                        suresh.krishnan@ericsson.com\nMirja Kühlewind      Transport Area                       ietf@kuehlewind.net\nTerry Manderson      Internet Area                        terry.manderson@icann.org\nAlexey Melnikov      Applications and Real-Time Area      aamelnikov@fastmail.fm\nKathleen Moriarty    Security Area                        Kathleen.Moriarty.ietf@gmail.com\nAlvaro Retana        Routing Area                         aretana@cisco.com\n===================  ===================================  ========================\n\n\nLiaison and ex-officio members include:\n\n===================  ===================================  ========================\nOlaf Kolkman         IAB Chair                            iab-chair@iab.org\nDanny McPherson      IAB Liaison                          danny@tcb.net\nMichelle Cotton      IANA Liaison                         iana@iana.org\nSandy Ginoza         RFC Editor Liaison                   rfc-editor@rfc-editor.org\nAlexa Morris         IETF Secretariat Liaison             exec-director@ietf.org\n===================  ===================================  ========================\n\n\nThe IETF has a Secretariat, which is managed by Association Management Solutions, LLC (AMS) in Fremont, California.The IETF Executive Director is Alexa Morris (exec-director@ietf.org).\n\n\nOther personnel that provide full-time support to the Secretariat include:\n\n=========================  ===================================\nSenior Meeting Planner     Marcia Beaulieu\nProject Manager            Stephanie McCammon\nMeeting Regsitrar          Maddy Conner\nProject Manager            Cindy Morgan\nProject Manager            Amy Vezza\n=========================  ===================================\n\nTo contact the Secretariat, please refer to the addresses and URLs provided on the IETF Secretariat Web page.\n\nThe IETF also has a general Administrative Support Activity headed by the IETF Administrative Director, Ray Pelletier iad@ietf.org\n\nThe working groups conduct their business during the tri-annual IETF meetings, at interim working group meetings, and via electronic mail on mailing lists established for each group. The tri-annual IETF meetings are 4.5 days in duration, and consist of working group sessions, training sessions, and plenary sessions. The plenary sessions include technical presentations, status reports, and an open IESG meeting.\n\nFollowing each meeting, the IETF Secretariat publishes meeting proceedings, which contain reports from all of the groups that met, as well as presentation slides, where available. The proceedings also include a summary of the standards-related activities that took place since the previous IETF meeting.\n\nMeeting minutes, working group charters (including information about the working group mailing lists), and general information on current IETF activities are available on the IETF Web site at https://www.ietf.org.\n",
+      "path": "/meeting/proceedings/defaults/overview.rst",
+      "type": "rst"
+    },
+    "model": "dbtemplate.dbtemplate",
+    "pk": 179
+  },
+  {
+    "fields": {
+      "order": 0,
+      "used": true,
+      "name": "reStructuredText",
+      "desc": ""
+    },
+    "model": "name.dbtemplatetypename",
+    "pk": "rst"
+  },
+  {
+    "fields": {
+      "charter": null,
+      "unused_states": [],
+      "description": "",
+      "parent": null,
+      "list_email": "",
+      "acronym": "ietf",
+      "comments": "",
+      "list_subscribe": "",
+      "state": "active",
+      "time": "2012-02-26T00:21:36",
+      "unused_tags": [],
+      "list_archive": "",
+      "type": "ietf",
+      "name": "IETF"
+    },
+    "model": "group.group",
+    "pk": 1
+  },
+  {
+    "fields": {
+      "order": 0,
+      "used": true,
+      "name": "Active",
+      "desc": ""
+    },
+    "model": "name.groupstatename",
+    "pk": "active"
+  },
+  {
+    "fields": {
+      "order": 0,
+      "used": true,
+      "verbose_name": "Internet Engineering Task Force",
+      "name": "IETF",
+      "desc": ""
+    },
+    "model": "name.grouptypename",
+    "pk": "ietf"
+  }
+]