Merge pull request #2997 from cisagov/za/2868-admin-federal-agency-updates

#2868: Django admin federal agency page form updates - [BACKUP] - [MIGRATIONS]

src/registrar/migrations/0135_alter_federalagency_agency_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-10-28 16:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "registrar",
+            "0134_rename_portfolio_additional_permissions_portfolioinvitation_additional_permissions_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="federalagency",
+            name="agency",
+            field=models.CharField(null=True, verbose_name="Federal agency"),
+        ),
+        migrations.AlterField(
+            model_name="federalagency",
+            name="federal_type",
+            field=models.CharField(
+                choices=[("executive", "Executive"), ("judicial", "Judicial"), ("legislative", "Legislative")],
+                max_length=20,
+                null=True,
+            ),
+        ),
+    ]

src/registrar/models/federal_agency.py

@@ -13,15 +13,15 @@ class FederalAgency(TimeStampedModel):
 
     agency = models.CharField(
         null=True,
-        blank=True,
+        blank=False,
-        help_text="Federal agency",
+        verbose_name="Federal agency",
     )
 
     federal_type = models.CharField(
         max_length=20,
         choices=BranchChoices.choices,
         null=True,
-        blank=True,
+        blank=False,
     )
 
     acronym = models.CharField(