Merged changes from current trunk to Py3 branch.

 - Legacy-Id: 16468

Author: levkowetz

PLAN

@@ -15,6 +15,14 @@ Planned work in rough order
 * Transition to Python 3.  This will make it easier to add add support for
   internationalsed email, and also other i18n enhancements.
 
+* Change the draft submission form so that an email address is required for
+  each author in order to complete self-service draft submission.  Missing
+  email address(es) will lead to failure, and require submission via the
+  secretariat (where email addresses for all will also be required).
+
+* Simplify submission if submitter is logged into the datatracker, skipping the
+  email verification step.
+
 * Polish the htmlization pages, making the style identical with tools.ietf.org.
 
 * Revisit the review tool, work through the accumulated tickets.

changelog

@@ -1,3 +1,71 @@
+ietfdb (6.98.4) ietf; urgency=medium
+
+  This is a small bugfix release, to clear the slate before merging
+  in the Python 2/3 conversion.  From the commit log:
+
+  * Added a validation step for SearchablePersonField, to avoid later 
+    server 500 errors on bad input.
+
+  * Merged in [16404] from rjsparks@nostrum.com:
+    Only look for ietf/datatracker-env images when extracting the most 
+    recent build to tag as latest.  
+
+  * Merged in [16359] from rcross@amsl.com:
+    Fix registration import, use user.person if it exists.   
+
+  * Merged in [16096] from rcross@amsl.com:
+    Update admin permissions. Grant secretariat change permissions on 
+    dbtemplate so they can update proceedings pages.  
+
+  * Turned off html autoescape in IPR email templates.  This fixes
+    inappropriate html escapes that occurred in various IPR-related
+    emails.
+
+  * Added missing code to skip coverage measurement for skippable tests.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  16 Jul 2019 14:14:12 +0000
+  
+
+ietfdb (6.98.3) ietf; urgency=medium
+
+  * Increased the length of the list Subscribed email field from 64 to 128, 
+    updated the import_mailman_listinfo management command, and added a 
+    migration for the model change.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  04 Jul 2019 16:07:14 +0000
+
+
+ietfdb (6.98.2) ietf; urgency=medium
+
+  This is a minor release that fixes some bugs and tweaks some settings.
+  From the commit log:
+
+  * Changed some tests to match production group type changes for some special
+    groups.
+
+  * Made the bin/daily cron script quiteter.
+
+  * Various changes to make yang-related management commands quieter
+
+  * Added a fix for an issue in get_meeting_registration_data() which could
+    happen if we tried to create a Person record for with a user of an
+    existing Person.
+
+  * Changed the permitted length of patent_title from 127 to 255.
+
+  * Added additional guards against duplicate m2m entries.
+
+  * Added a utility to check copyright statements in specified files.
+
+  * Updated some functions and views in secr/srec/ to use GroupFeatures 
+    instead of hardcoded lists of group types.
+
+  * Made session requests also work for ad-hoc groups, which may not have a 
+    parent area.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  03 Jul 2019 20:27:54 +0000
+
+
 ietfdb (6.98.1) ietf; urgency=medium
 
   This is a bugfix release that cleans up some remaining issues from the

docker/build

@@ -123,6 +123,6 @@ fi
 
 docker rmi -f ietf/datatracker-environment:trunk || true
 docker build -t ietf/datatracker-environment:$TAG docker/
-docker tag $(docker images -q | head -n 1) ietf/datatracker-environment:latest
+docker tag $(docker images -q ietf/datatracker-environment | head -n 1) ietf/datatracker-environment:latest
 docker push ietf/datatracker-environment:latest
-docker push ietf/datatracker-environment:$TAG
+docker push ietf/datatracker-environment:$TAG

ietf/__init__.py

@@ -7,13 +7,13 @@
 from . import checks                           # pyflakes:ignore
 
 # Don't add patch number here:
-__version__ = "6.98.2.dev0"
+__version__ = "6.98.5.dev0"
 
 # set this to ".p1", ".p2", etc. after patching
 __patch__   = ""
 
 __date__    = "$Date$"
 
-__rev__     = "$Rev$ (dev) Latest release: Rev. 16294 "
+__rev__     = "$Rev$ (dev) Latest release: Rev. 16464 "
 
 __id__      = "$Id$"

ietf/bin/set_admin_permissions

@@ -55,6 +55,7 @@ def main():
 
     # Set Auth Group Admin Permissions
     names = ['auth.add_user','auth.change_user','auth.delete_user',
+             'dbtemplate.change_dbtemplate',
              'group.add_group','group.change_group','group.delete_group',
              'group.add_role','group.change_role','group.delete_role',
              'group.add_groupevent','group.change_groupevent','group.delete_groupevent',

ietf/community/tests.py

@@ -88,7 +88,8 @@ def test_view_list(self):
 
         # with list
         clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        clist.added_docs.add(draft)
+        if not draft in clist.added_docs.all():
+            clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
             rule_type="name_contains",
@@ -250,7 +251,8 @@ def test_csv(self):
 
         # with list
         clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        clist.added_docs.add(draft)
+        if not draft in clist.added_docs.all():
+            clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
             rule_type="name_contains",
@@ -285,7 +287,8 @@ def test_feed(self):
 
         # with list
         clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        clist.added_docs.add(draft)
+        if not draft in clist.added_docs.all():
+            clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
             rule_type="name_contains",
@@ -326,7 +329,8 @@ def test_subscription(self):
 
         # subscription with list
         clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        clist.added_docs.add(draft)
+        if not draft in clist.added_docs.all():
+            clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
             rule_type="name_contains",
@@ -369,7 +373,8 @@ def test_notification(self):
         draft = WgDraftFactory()
 
         clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        clist.added_docs.add(draft)
+        if not draft in clist.added_docs.all():
+            clist.added_docs.add(draft)
 
         EmailSubscription.objects.create(community_list=clist, email=Email.objects.filter(person__user__username="plain").first(), notify_on="significant")
 

ietf/community/views.py

@@ -59,7 +59,8 @@ def manage_list(request, username=None, acronym=None, group_type=None):
                 clist.save()
 
             for d in add_doc_form.cleaned_data['documents']:
-                clist.added_docs.add(d)
+                if not d in clist.added_docs.all():
+                    clist.added_docs.add(d)
 
             return HttpResponseRedirect("")
     else:
@@ -136,7 +137,8 @@ def track_document(request, name, username=None, acronym=None):
         if clist.pk is None:
             clist.save()
 
-        clist.added_docs.add(doc)
+        if not doc in clist.added_docs.all():
+            clist.added_docs.add(doc)
 
         if request.is_ajax():
             return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')

ietf/doc/tests_review.py

@@ -101,8 +101,6 @@ def test_request_review(self):
 
         self.assertEqual(len(outbox),2)
         self.assertTrue('reviewteam Early' in outbox[0]['Subject'])
-        if not 'reviewsecretary@' in outbox[0]['To']:
-            print(outbox[0].as_string())
         self.assertTrue('reviewsecretary@' in outbox[0]['To'])
         self.assertTrue('reviewteam3 Early' in outbox[1]['Subject'])
         if not 'reviewsecretary3@' in outbox[1]['To']:

ietf/ipr/fields.py

@@ -11,6 +11,8 @@
 from django import forms
 from django.urls import reverse as urlreverse
 
+import debug                            # pyflakes:ignore
+
 from ietf.ipr.models import IprDisclosureBase
 
 def select2_id_ipr_title_json(value):

ietf/ipr/forms.py

@@ -160,7 +160,7 @@ class GenericDisclosureForm(forms.Form):
     patent_number = forms.CharField(max_length=127, required=False, validators=[ validate_patent_number ],
         help_text = "Patent publication or application number (2-letter country code followed by serial number)")
     patent_inventor =  forms.CharField(max_length=63, required=False, validators=[ validate_name ], help_text="Inventor name")
-    patent_title =  forms.CharField(max_length=127, required=False, validators=[ validate_title ], help_text="Title of invention")
+    patent_title =  forms.CharField(max_length=255, required=False, validators=[ validate_title ], help_text="Title of invention")
     patent_date =  forms.DateField(required=False, help_text="Date granted or applied for")
     patent_notes =  forms.CharField(max_length=1024, required=False, widget=forms.Textarea)
 
@@ -229,7 +229,7 @@ class IprDisclosureFormBase(forms.ModelForm):
     patent_number = forms.CharField(max_length=127, required=True, validators=[ validate_patent_number ],
         help_text = "Patent publication or application number (2-letter country code followed by serial number)")
     patent_inventor =  forms.CharField(max_length=63, required=True, validators=[ validate_name ], help_text="Inventor name")
-    patent_title =  forms.CharField(max_length=127, required=True, validators=[ validate_title ], help_text="Title of invention")
+    patent_title =  forms.CharField(max_length=255, required=True, validators=[ validate_title ], help_text="Title of invention")
     patent_date =  forms.DateField(required=True, help_text="Date granted or applied for")
     patent_notes =  forms.CharField(max_length=1024, required=False, widget=forms.Textarea)