add: client-side sorting of select-entries (much easier for language-…

…dependant sorting
basxsoftwareassociation · Jun 21, 2024 · d19ae42 · d19ae42
1 parent 7ceeafb
commit d19ae42
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/basxbread/contrib/document_templates/models.py b/basxbread/contrib/document_templates/models.py
@@ -35,7 +35,7 @@ class DocumentTemplate(models.Model):
         ContentType, on_delete=models.PROTECT, verbose_name=_("Model")
     )
     model.formfield_kwargs = {
-        "queryset": ContentType.objects.all().order_by("app_label", "model")
+        "widget": forms.Select(attrs={"_class": "autosort"}),
     }
     filename_template = models.TextField(_("Filename template"), blank=True)
     filename_template.formfield_kwargs = {"widget": forms.Textarea(attrs={"rows": 1})}

diff --git a/basxbread/contrib/reports/models.py b/basxbread/contrib/reports/models.py
@@ -24,7 +24,7 @@ class Report(models.Model):
         ContentType, on_delete=models.PROTECT, verbose_name=_("Model")
     )
     model.formfield_kwargs = {
-        "queryset": ContentType.objects.all().order_by("app_label", "model")
+        "widget": forms.Select(attrs={"_class": "autosort"}),
     }
     filter = QuerysetField(_("Filter"), modelfieldname="model")
     custom_queryset = models.CharField(

diff --git a/basxbread/contrib/triggers/models.py b/basxbread/contrib/triggers/models.py
@@ -2,6 +2,7 @@
 import typing
 
 import htmlgenerator as hg
+from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
@@ -53,7 +54,7 @@ class Action(models.Model):
         null=True,  # just for backwards-compatability
     )
     model.formfield_kwargs = {
-        "queryset": ContentType.objects.all().order_by("app_label", "model")
+        "widget": forms.Select(attrs={"_class": "autosort"}),
     }
 
     def run(self, object):
@@ -129,7 +130,7 @@ class Trigger(models.Model):
         on_delete=models.PROTECT,
     )
     model.formfield_kwargs = {
-        "queryset": ContentType.objects.all().order_by("app_label", "model")
+        "widget": forms.Select(attrs={"_class": "autosort"}),
     }
     filter = QuerysetField(_("Filter"), modelfieldname="model")
     enable = models.BooleanField(default=True)

diff --git a/basxbread/static/js/main.js b/basxbread/static/js/main.js
@@ -10,6 +10,7 @@ function basxbread_load_elements() {
   $$(
     "[onload]:not(body):not(frame):not(iframe):not(img):not(link):not(script):not(style)"
   )._.fire("load");
+  $$("select.autosort").forEach(breadSortSelect);
 
   setBasxBreadCookie("timezone", Intl.DateTimeFormat().resolvedOptions().timeZone);
 }
@@ -198,3 +199,9 @@ function searchMatchRank(searchTerms, value) {
   return score;
 }
 
+function breadSortSelect(selectNode) {
+  optionNodes = Array.from(selectNode.children);
+  comparator = new Intl.Collator().compare;
+  optionNodes.sort((a, b) => comparator(a.textContent, b.textContent));
+  optionNodes.forEach((option) => selectNode.appendChild(option));
+}