fix: Use Django Collate() when listing all ADs

ietf/doc/forms.py

@@ -5,8 +5,10 @@
 import datetime
 import debug #pyflakes:ignore
 from django import forms
+from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import validate_email
+from django.db.models.functions import Collate
 
 from ietf.doc.fields import SearchableDocumentField, SearchableDocumentsField
 from ietf.doc.models import RelatedDocument, DocExtResource, State
@@ -63,8 +65,14 @@ class DocAuthorChangeBasisForm(forms.Form):
                             help_text='What is the source or reasoning for the changes to the author list?')
 
 class AdForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type='area').order_by('name'),
-                                label="Shepherding AD", empty_label="(None)", required=True)
+    ad = forms.ModelChoiceField(
+        Person.objects.filter(
+            role__name="ad", role__group__state="active", role__group__type="area"
+        ).order_by(Collate("name", settings.PREFERRED_COLLATION)),
+        label="Shepherding AD",
+        empty_label="(None)",
+        required=True,
+    )
 
     def __init__(self, *args, **kwargs):
         super(self.__class__, self).__init__(*args, **kwargs)

ietf/doc/views_charter.py

@@ -20,6 +20,7 @@
 from django.utils import timezone
 from django.utils.encoding import force_str
 from django.utils.html import escape
+from django.db.models.functions import Collate
 
 import debug                            # pyflakes:ignore
 
@@ -305,8 +306,14 @@ def change_title(request, name, option=None):
                   ))
 
 class AdForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area").order_by('name'),
-                                label="Responsible AD", empty_label="(None)", required=True)
+    ad = forms.ModelChoiceField(
+        Person.objects.filter(
+            role__name="ad", role__group__state="active", role__group__type="area"
+        ).order_by(Collate("name", settings.PREFERRED_COLLATION)),
+        label="Responsible AD",
+        empty_label="(None)",
+        required=True,
+    )
 
     def __init__(self, *args, **kwargs):
         super(self.__class__, self).__init__(*args, **kwargs)

ietf/doc/views_conflict_review.py

@@ -14,6 +14,7 @@
 from django.template.loader import render_to_string
 from django.conf import settings
 from django.utils.html import escape
+from django.db.models.functions import Collate
 
 import debug                            # pyflakes:ignore
 
@@ -404,8 +405,14 @@ class SimpleStartReviewForm(forms.Form):
     )
 
 class StartReviewForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
-                                label="Shepherding AD", empty_label="(None)", required=True)
+    ad = forms.ModelChoiceField(
+        Person.objects.filter(
+            role__name="ad", role__group__state="active", role__group__type="area"
+        ).order_by(Collate("name", settings.PREFERRED_COLLATION)),
+        label="Shepherding AD",
+        empty_label="(None)",
+        required=True,
+    )
     create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev", slug__in=("needshep", "adrev")), empty_label=None, required=False)
     notify = forms.CharField(
         widget=forms.Textarea,

ietf/doc/views_draft.py

@@ -20,6 +20,8 @@
 from django.forms.utils import ErrorList
 from django.template.defaultfilters import pluralize
 from django.utils import timezone
+from django.db.models.functions import Collate
+
 
 import debug                            # pyflakes:ignore
 
@@ -1130,7 +1132,7 @@ class AdForm(forms.Form):
             role__name__in=("ad", "pre-ad"),
             role__group__state="active",
             role__group__type="area",
-        ).order_by('name'),
+        ).order_by(Collate('name', settings.PREFERRED_COLLATION)),
         label="Shepherding AD",
         empty_label="(None)",
         required=False,

ietf/doc/views_status_change.py

@@ -18,6 +18,7 @@
 from django.conf import settings
 from django.utils.encoding import force_str
 from django.utils.html import escape
+from django.db.models.functions import Collate
 
 import debug                            # pyflakes:ignore
 from ietf.doc.mails import email_ad_approved_status_change
@@ -484,8 +485,14 @@ def clean(self):
 class StartStatusChangeForm(forms.Form):
     document_name = forms.CharField(max_length=255, label="Document name", help_text="A descriptive name such as status-change-md2-to-historic is better than status-change-rfc1319.", required=True)
     title = forms.CharField(max_length=255, label="Title", required=True)
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
-                                label="Shepherding AD", empty_label="(None)", required=False)
+    ad = forms.ModelChoiceField(
+        Person.objects.filter(
+            role__name="ad", role__group__state="active", role__group__type="area"
+        ).order_by(Collate("name", settings.PREFERRED_COLLATION)),
+        label="Shepherding AD",
+        empty_label="(None)",
+        required=False,
+    )
     create_in_state = forms.ModelChoiceField(State.objects.filter(type="statchg", slug__in=("needshep", "adrev")), empty_label=None, required=False)
     notify = forms.CharField(
         widget=forms.Textarea,

ietf/settings.py

@@ -121,6 +121,14 @@
 }
 
 
+# Collation that we wish we were using. The production database is currently using
+# the C collation, which does not handle accented characters. Do not change this
+# without confirming that the production and dev databases support the new collation.
+# This setting and places we use it can go away if we switch the production database
+# collation. That requires creating and populating a new database, it cannot be done
+# on an existing one.
+PREFERRED_COLLATION = "en-US-x-icu"
+
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 # although not all variations may be possible on all operating systems.