Restore sorting for Class Ordering.

hypha/apply/funds/migrations/0139_alter_applicationbasedeterminationform_options_and_more.py

@@ -0,0 +1,156 @@
+# Generated by Django 5.2.17 on 2026-09-22 09:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("funds", "0138_add_is_pii_to_application_form_fields"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="applicationbasedeterminationform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base determination form",
+                "verbose_name_plural": "application base determination forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbaseexternalreviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base external review form",
+                "verbose_name_plural": "application base external review forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbaseform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base form",
+                "verbose_name_plural": "application base forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbaseprojectform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base project form",
+                "verbose_name_plural": "application base project forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbaseprojectreportform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base project report form",
+                "verbose_name_plural": "application base project report forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbaseprojectsowform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base project SOW form",
+                "verbose_name_plural": "application base project SOW forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="applicationbasereviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "application base review form",
+                "verbose_name_plural": "application base review forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbasedeterminationform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base determination form",
+                "verbose_name_plural": "lab base determination forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbaseexternalreviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base external review form",
+                "verbose_name_plural": "lab base external review forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbaseform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base form",
+                "verbose_name_plural": "lab base forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbaseprojectform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base project form",
+                "verbose_name_plural": "lab base project forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbaseprojectreportform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base project report form",
+                "verbose_name_plural": "lab base project report forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbaseprojectsowform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base project SOW form",
+                "verbose_name_plural": "lab base project SOW forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="labbasereviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "lab base review form",
+                "verbose_name_plural": "lab base review forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="roundbasedeterminationform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "round base determination form",
+                "verbose_name_plural": "round base determination forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="roundbaseexternalreviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "round base external review form",
+                "verbose_name_plural": "round base external review forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="roundbaseform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "round base form",
+                "verbose_name_plural": "round base forms",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="roundbasereviewform",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "round base review form",
+                "verbose_name_plural": "round base review forms",
+            },
+        ),
+    ]

hypha/apply/funds/models/forms.py

@@ -73,23 +73,23 @@ def __str__(self):
 class ApplicationBaseForm(AbstractRelatedForm):
     application = ParentalKey("ApplicationBase", related_name="forms")
 
-    class Meta:
+    class Meta(AbstractRelatedForm.Meta):
         verbose_name = _("application base form")
         verbose_name_plural = _("application base forms")
 
 
 class RoundBaseForm(AbstractRelatedForm):
     round = ParentalKey("RoundBase", related_name="forms")
 
-    class Meta:
+    class Meta(AbstractRelatedForm.Meta):
         verbose_name = _("round base form")
         verbose_name_plural = _("round base forms")
 
 
 class LabBaseForm(AbstractRelatedForm):
     lab = ParentalKey("LabBase", related_name="forms")
 
-    class Meta:
+    class Meta(AbstractRelatedForm.Meta):
         verbose_name = _("lab base form")
         verbose_name_plural = _("lab base forms")
 
@@ -175,71 +175,71 @@ def __str__(self):
 class ApplicationBaseReviewForm(AbstractRelatedReviewForm):
     application = ParentalKey("ApplicationBase", related_name="review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("application base review form")
         verbose_name_plural = _("application base review forms")
 
 
 class ApplicationBaseExternalReviewForm(AbstractRelatedReviewForm):
     application = ParentalKey("ApplicationBase", related_name="external_review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("application base external review form")
         verbose_name_plural = _("application base external review forms")
 
 
 class RoundBaseReviewForm(AbstractRelatedReviewForm):
     round = ParentalKey("RoundBase", related_name="review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("round base review form")
         verbose_name_plural = _("round base review forms")
 
 
 class RoundBaseExternalReviewForm(AbstractRelatedReviewForm):
     round = ParentalKey("RoundBase", related_name="external_review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("round base external review form")
         verbose_name_plural = _("round base external review forms")
 
 
 class LabBaseReviewForm(AbstractRelatedReviewForm):
     lab = ParentalKey("LabBase", related_name="review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("lab base review form")
         verbose_name_plural = _("lab base review forms")
 
 
 class LabBaseExternalReviewForm(AbstractRelatedReviewForm):
     lab = ParentalKey("LabBase", related_name="external_review_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedReviewForm.Meta):
         verbose_name = _("lab base external review form")
         verbose_name_plural = _("lab base external review forms")
 
 
 class ApplicationBaseDeterminationForm(AbstractRelatedDeterminationForm):
     application = ParentalKey("ApplicationBase", related_name="determination_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedDeterminationForm.Meta):
         verbose_name = _("application base determination form")
         verbose_name_plural = _("application base determination forms")
 
 
 class RoundBaseDeterminationForm(AbstractRelatedDeterminationForm):
     round = ParentalKey("RoundBase", related_name="determination_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedDeterminationForm.Meta):
         verbose_name = _("round base determination form")
         verbose_name_plural = _("round base determination forms")
 
 
 class LabBaseDeterminationForm(AbstractRelatedDeterminationForm):
     lab = ParentalKey("LabBase", related_name="determination_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedDeterminationForm.Meta):
         verbose_name = _("lab base determination form")
         verbose_name_plural = _("lab base determination forms")
 
@@ -311,31 +311,31 @@ def __str__(self):
 class ApplicationBaseProjectForm(AbstractRelatedProjectForm):
     application = ParentalKey("ApplicationBase", related_name="approval_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectForm.Meta):
         verbose_name = _("application base project form")
         verbose_name_plural = _("application base project forms")
 
 
 class ApplicationBaseProjectSOWForm(AbstractRelatedProjectSOWForm):
     application = ParentalKey("ApplicationBase", related_name="sow_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectSOWForm.Meta):
         verbose_name = _("application base project SOW form")
         verbose_name_plural = _("application base project SOW forms")
 
 
 class LabBaseProjectForm(AbstractRelatedProjectForm):
     lab = ParentalKey("LabBase", related_name="approval_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectForm.Meta):
         verbose_name = _("lab base project form")
         verbose_name_plural = _("lab base project forms")
 
 
 class LabBaseProjectSOWForm(AbstractRelatedProjectSOWForm):
     lab = ParentalKey("LabBase", related_name="sow_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectSOWForm.Meta):
         verbose_name = _("lab base project SOW form")
         verbose_name_plural = _("lab base project SOW forms")
 
@@ -372,14 +372,14 @@ def __str__(self):
 class ApplicationBaseProjectReportForm(AbstractRelatedProjectReportForm):
     application = ParentalKey("ApplicationBase", related_name="report_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectReportForm.Meta):
         verbose_name = _("application base project report form")
         verbose_name_plural = _("application base project report forms")
 
 
 class LabBaseProjectReportForm(AbstractRelatedProjectReportForm):
     lab = ParentalKey("LabBase", related_name="report_forms")
 
-    class Meta:
+    class Meta(AbstractRelatedProjectReportForm.Meta):
         verbose_name = _("lab base project report form")
         verbose_name_plural = _("lab base project report forms")

hypha/apply/projects/migrations/0110_alter_pafreviewersrole_options_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.17 on 2026-09-22 09:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("application_projects", "0109_create_project_form_pointers"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="pafreviewersrole",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "PAF reviewers role",
+                "verbose_name_plural": "PAF reviewers roles",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="projectreminderfrequency",
+            options={
+                "ordering": ["sort_order"],
+                "verbose_name": "project reminder frequency",
+                "verbose_name_plural": "project reminder frequencies",
+            },
+        ),
+    ]

hypha/apply/projects/models/project.py

@@ -610,7 +610,7 @@ class PAFReviewersRole(Orderable, ClusterableModel):
         FieldPanel("user_roles", widget=forms.CheckboxSelectMultiple),
     ]
 
-    class Meta:
+    class Meta(Orderable.Meta):
         verbose_name = _("PAF reviewers role")
         verbose_name_plural = _("PAF reviewers roles")
 
@@ -637,7 +637,7 @@ class FrequencyRelation(models.TextChoices):
         FieldPanel("relation", heading=_("Relation to report due date")),
     ]
 
-    class Meta:
+    class Meta(Orderable.Meta):
         verbose_name = _("project reminder frequency")
         verbose_name_plural = _("project reminder frequencies")