diff --git a/hypha/apply/funds/migrations/0139_alter_applicationbasedeterminationform_options_and_more.py b/hypha/apply/funds/migrations/0139_alter_applicationbasedeterminationform_options_and_more.py new file mode 100644 index 0000000000..d5eb9f26c2 --- /dev/null +++ b/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", + }, + ), + ] diff --git a/hypha/apply/funds/models/forms.py b/hypha/apply/funds/models/forms.py index d6925fdc5d..81a9e7653d 100644 --- a/hypha/apply/funds/models/forms.py +++ b/hypha/apply/funds/models/forms.py @@ -73,7 +73,7 @@ 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") @@ -81,7 +81,7 @@ class Meta: 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") @@ -89,7 +89,7 @@ class Meta: 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,7 +175,7 @@ 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") @@ -183,7 +183,7 @@ class Meta: 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") @@ -191,7 +191,7 @@ class Meta: 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") @@ -199,7 +199,7 @@ class Meta: 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") @@ -207,7 +207,7 @@ class Meta: 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") @@ -215,7 +215,7 @@ class Meta: 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") @@ -223,7 +223,7 @@ class Meta: 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") @@ -231,7 +231,7 @@ class Meta: 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") @@ -239,7 +239,7 @@ class Meta: 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,7 +311,7 @@ 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") @@ -319,7 +319,7 @@ class Meta: 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") @@ -327,7 +327,7 @@ class Meta: 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") @@ -335,7 +335,7 @@ class Meta: 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,7 +372,7 @@ 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") @@ -380,6 +380,6 @@ class Meta: 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") diff --git a/hypha/apply/projects/migrations/0110_alter_pafreviewersrole_options_and_more.py b/hypha/apply/projects/migrations/0110_alter_pafreviewersrole_options_and_more.py new file mode 100644 index 0000000000..d55db0078e --- /dev/null +++ b/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", + }, + ), + ] diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py index 92b70cae96..2ae28b842b 100644 --- a/hypha/apply/projects/models/project.py +++ b/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")