Add support for extracting the country line from the author addresses

to the draft parser (incorporating patch from trunk), store the
extracted country instead of trying to turn it into an ISO country
code, add country and continent name models and add initial data for
those, add helper function for cleaning the countries, add author
country and continent charts, move the affiliation models to
stats/models.py, fix a bunch of bugs.
 - Legacy-Id: 12846

Author: OleLaursen

ietf/doc/admin.py

@@ -174,7 +174,8 @@ class BallotPositionDocEventAdmin(DocEventAdmin):
 admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin)
 
 class DocumentAuthorAdmin(admin.ModelAdmin):
-    list_display = ['id', 'document', 'person', 'email', 'affiliation', 'order']
-    search_fields = [ 'document__name', 'person__name', 'email__address', 'affiliation']
+    list_display = ['id', 'document', 'person', 'email', 'affiliation', 'country', 'order']
+    search_fields = ['document__docalias__name', 'person__name', 'email__address', 'affiliation', 'country']
+    raw_id_fields = ["document", "person", "email"]
 admin.site.register(DocumentAuthor, DocumentAuthorAdmin)
 

ietf/doc/migrations/0020_auto_20170112_0753.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import django_countries.fields
 
 
 class Migration(migrations.Migration):
@@ -49,7 +48,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='dochistoryauthor',
             name='country',
-            field=django_countries.fields.CountryField(blank=True, help_text=b'Country used by author for submission', max_length=2),
+            field=models.CharField(blank=True, help_text=b'Country used by author for submission', max_length=255),
         ),
         migrations.RenameField(
             model_name='dochistoryauthor',
@@ -74,7 +73,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='documentauthor',
             name='country',
-            field=django_countries.fields.CountryField(blank=True, help_text=b'Country used by author for submission', max_length=2),
+            field=models.CharField(blank=True, help_text=b'Country used by author for submission', max_length=255),
         ),
         migrations.RenameField(
             model_name='documentauthor',

ietf/doc/models.py

@@ -11,8 +11,6 @@
 from django.conf import settings
 from django.utils.html import mark_safe
 
-from django_countries.fields import CountryField
-
 import debug                            # pyflakes:ignore
 
 from ietf.group.models import Group
@@ -406,7 +404,7 @@ class DocumentAuthorInfo(models.Model):
     # email should only be null for some historic documents
     email = models.ForeignKey(Email, help_text="Email address used by author for submission", blank=True, null=True)
     affiliation = models.CharField(max_length=100, blank=True, help_text="Organization/company used by author for submission")
-    country = CountryField(blank=True, help_text="Country used by author for submission")
+    country = models.CharField(max_length=255, blank=True, help_text="Country used by author for submission")
     order = models.IntegerField(default=1)
 
     def formatted_email(self):

ietf/name/admin.py

@@ -1,7 +1,8 @@
 from django.contrib import admin
 
 from ietf.name.models import (
-    BallotPositionName, ConstraintName, DBTemplateTypeName, DocRelationshipName,
+    BallotPositionName, ConstraintName, ContinentName, CountryName,
+    DBTemplateTypeName, DocRelationshipName,
     DocReminderTypeName, DocTagName, DocTypeName, DraftSubmissionStateName,
     FeedbackTypeName, FormalLanguageName, GroupMilestoneStateName, GroupStateName, GroupTypeName,
     IntendedStdLevelName, IprDisclosureStateName, IprEventTypeName, IprLicenseTypeName,
@@ -10,8 +11,11 @@
     ReviewRequestStateName, ReviewResultName, ReviewTypeName, RoleName, RoomResourceName,
     SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName, )
 
+from ietf.stats.models import CountryAlias
+
 class NameAdmin(admin.ModelAdmin):
     list_display = ["slug", "name", "desc", "used"]
+    search_fields = ["slug", "name"]
     prepopulate_from = { "slug": ("name",) }
 
 class DocRelationshipNameAdmin(NameAdmin):
@@ -26,8 +30,19 @@ class GroupTypeNameAdmin(NameAdmin):
     list_display = ["slug", "name", "verbose_name", "desc", "used"]
 admin.site.register(GroupTypeName, GroupTypeNameAdmin)
 
+class CountryAliasInline(admin.TabularInline):
+    model = CountryAlias
+    extra = 1
+
+class CountryNameAdmin(NameAdmin):
+    list_display = ["slug", "name", "continent", "in_eu"]
+    list_filter = ["continent", "in_eu"]
+    inlines = [CountryAliasInline]
+admin.site.register(CountryName, CountryNameAdmin)
+
 admin.site.register(BallotPositionName, NameAdmin)
 admin.site.register(ConstraintName, NameAdmin)
+admin.site.register(ContinentName, NameAdmin)
 admin.site.register(DBTemplateTypeName, NameAdmin)
 admin.site.register(DocReminderTypeName, NameAdmin)
 admin.site.register(DocTagName, NameAdmin)

ietf/name/migrations/0019_continentname_countryname.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0018_add_formlang_names'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContinentName',
+            fields=[
+                ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='CountryName',
+            fields=[
+                ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('in_eu', models.BooleanField(default=False, verbose_name='In EU')),
+                ('continent', models.ForeignKey(to='name.ContinentName')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+    ]