Merged in Django 2.1 upgrade changes.

 - Legacy-Id: 18060

Author: levkowetz

ietf/doc/migrations/0032_auto_20200624_1332.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.15 on 2020-06-24 13:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0031_set_state_for_charters_of_replaced_groups'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ballotpositiondocevent',
+            name='send_email',
+            field=models.BooleanField(default=None, null=True),
+        ),
+        migrations.AlterField(
+            model_name='consensusdocevent',
+            name='consensus',
+            field=models.BooleanField(default=None, null=True),
+        ),
+    ]

ietf/doc/models.py

@@ -1073,7 +1073,7 @@ class StateDocEvent(DocEvent):
     state = ForeignKey(State, blank=True, null=True)
 
 class ConsensusDocEvent(DocEvent):
-    consensus = models.NullBooleanField(default=None)
+    consensus = models.BooleanField(null=True, default=None)
 
 # IESG events
 class BallotType(models.Model):
@@ -1164,7 +1164,7 @@ class BallotPositionDocEvent(DocEvent):
     discuss_time = models.DateTimeField(help_text="Time discuss text was written", blank=True, null=True)
     comment = models.TextField(help_text="Optional comment", blank=True)
     comment_time = models.DateTimeField(help_text="Time optional comment was written", blank=True, null=True)
-    send_email = models.NullBooleanField(default=None)
+    send_email = models.BooleanField(null=True, default=None)
 
     @memoize
     def any_email_sent(self):

ietf/ietfauth/tests.py

@@ -24,7 +24,6 @@
 from unittest import skipIf
 from urllib.parse import urlsplit
 
-import django.contrib.auth.views
 from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 from django.conf import settings
@@ -91,7 +90,7 @@ def test_login_and_logout(self):
         self.assertEqual(urlsplit(r["Location"])[2], urlreverse(ietf.ietfauth.views.profile))
 
         # try logging out
-        r = self.client.get(urlreverse(django.contrib.auth.views.logout))
+        r = self.client.get(urlreverse('django.contrib.auth.views.logout'))
         self.assertEqual(r.status_code, 200)
 
         r = self.client.get(urlreverse(ietf.ietfauth.views.profile))
@@ -198,7 +197,7 @@ def test_create_whitelisted_account(self):
         self.assertContains(r, "Whitelist entry creation successful")
 
         # log out
-        r = self.client.get(urlreverse(django.contrib.auth.views.logout))
+        r = self.client.get(urlreverse('django.contrib.auth.views.logout'))
         self.assertEqual(r.status_code, 200)
 
         # register and verify whitelisted email

ietf/ietfauth/urls.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # Copyright The IETF Trust 2007, 2009, All Rights Reserved
 
-from django.contrib.auth.views import logout # type: ignore
+from django.contrib.auth.views import LogoutView # type: ignore
 
 from ietf.ietfauth import views
 from ietf.utils.urls import url
@@ -15,7 +15,7 @@
         url(r'^create/$', views.create_account),
         url(r'^create/confirm/(?P<auth>[^/]+)/$', views.confirm_account),
         url(r'^login/$', views.login),
-        url(r'^logout/$', logout),
+        url(r'^logout/$', LogoutView.as_view(), name="django.contrib.auth.views.logout"),
         url(r'^password/$', views.change_password),
         url(r'^profile/$', views.profile),
         url(r'^reset/$', views.password_reset),

ietf/liaisons/widgets.py

@@ -17,7 +17,7 @@ def __init__(self, *args, **kwargs):
         self.required_label = kwargs.pop('required_label', None)
         super(ButtonWidget, self).__init__(*args, **kwargs)
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, **kwargs):
         html = '<span style="display: none" class="showAttachsOn">%s</span>' % conditional_escape(self.show_on)
         html += '<span style="display: none" class="attachEnabledLabel">%s</span>' % conditional_escape(self.label)
         if self.require:
@@ -30,7 +30,7 @@ def render(self, name, value, attrs=None):
 
 
 class ShowAttachmentsWidget(Widget):
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, **kwargs):
         html = '<div id="id_%s">' % name
         html += '<span style="display: none" class="showAttachmentsEmpty form-control widget">No files attached</span>'
         html += '<div class="attachedFiles form-control widget">'

ietf/person/migrations/0012_auto_20200624_1332.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.15 on 2020-06-24 13:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0011_auto_20200608_1212'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='historicalperson',
+            name='consent',
+            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='consent',
+            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
+        ),
+    ]

ietf/person/models.py

@@ -48,7 +48,7 @@ class Person(models.Model):
     photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
     photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
     name_from_draft = models.CharField("Full Name (from submission)", null=True, max_length=255, editable=False, help_text="Name as found in a draft submission.")
-    consent = models.NullBooleanField("I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker", null=True, default=None)
+    consent = models.BooleanField("I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker", null=True, default=None)
 
     def __str__(self):
         return self.plain_name()

ietf/person/tests.py

@@ -6,6 +6,8 @@
 
 from pyquery import PyQuery
 from io import StringIO
+
+from django.http import HttpRequest
 from django.urls import reverse as urlreverse
 from django.utils.encoding import iri_to_uri
 
@@ -229,13 +231,17 @@ def test_move_related_objects(self):
         self.assertTrue(source_alias in target.alias_set.all())
 
     def test_merge_persons(self):
+        secretariat_role = RoleFactory(group__acronym='secretariat', name_id='secr')
+        user = secretariat_role.person.user
+        request = HttpRequest()
+        request.user = user
         source = PersonFactory()
         target = PersonFactory()
         source_id = source.pk
         source_email = source.email_set.first()
         source_alias = source.alias_set.first()
         source_user = source.user
-        merge_persons(source, target, file=StringIO())
+        merge_persons(request, source, target, file=StringIO())
         self.assertTrue(source_email in target.email_set.all())
         self.assertTrue(source_alias in target.alias_set.all())
         self.assertFalse(Person.objects.filter(id=source_id))

ietf/person/utils.py

@@ -9,7 +9,6 @@
 import syslog
 
 from django.contrib import admin
-from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 
@@ -18,7 +17,7 @@
 from ietf.person.models import Person
 from ietf.utils.mail import send_mail
 
-def merge_persons(source, target, file=sys.stdout, verbose=False):
+def merge_persons(request, source, target, file=sys.stdout, verbose=False):
     changes = []
 
     # write log
@@ -44,12 +43,8 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
 
     # check for any remaining relationships and exit if more found
     objs = [source]
-    opts = Person._meta
-    user = User.objects.filter(is_superuser=True).first()
-    admin_site = admin.site
-    using = 'default'
-    deletable_objects = admin.utils.get_deleted_objects(
-        objs, opts, user, admin_site, using)
+#    request.user = User.objects.filter(is_superuser=True).first()
+    deletable_objects = admin.utils.get_deleted_objects(objs, request, admin.site)
     deletable_objects_summary = deletable_objects[1]
     if len(deletable_objects_summary) > 1:    # should only inlcude one object (Person)
         print("Not Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
@@ -194,7 +189,6 @@ def get_active_balloters(ballot_type):
     return active_balloters
 
 def get_active_ads():
-    from ietf.person.models import Person
     cache_key = "doc:active_ads"
     active_ads = cache.get(cache_key)
     if not active_ads:
@@ -203,7 +197,6 @@ def get_active_ads():
     return active_ads
 
 def get_active_irsg():
-    from ietf.person.models import Person
     cache_key = "doc:active_irsg_balloters"
     active_irsg_balloters = cache.get(cache_key)
     if not active_irsg_balloters:

ietf/person/views.py

@@ -111,7 +111,7 @@ def merge(request):
             target = form.cleaned_data.get('target')
             # Do merge with force
             output = StringIO()
-            success, changes = merge_persons(source, target, file=output)
+            success, changes = merge_persons(request, source, target, file=output)
             if success:
                 messages.success(request, 'Merged {} ({}) to {} ({}). {})'.format(
                     source.name, source_id, target.name, target.id, changes))