From a1c63a809dda037f9eb3aff5eaf6bc637dec36c9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 5 Aug 2024 08:50:31 -0600
Subject: [PATCH] Make field not required

---
 src/registrar/forms/domain.py                 |  2 +-
 ...rtfolio_additional_permissions_and_more.py | 66 +++++++++++++++++++
 .../templates/domain_suborganization.html     |  1 -
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 src/registrar/migrations/0116_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 43c588d45..9c99cfbe6 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -159,7 +159,7 @@ class DomainSuborganizationForm(forms.ModelForm):
 
     sub_organization = forms.ModelChoiceField(
         queryset=Suborganization.objects.none(),
-        required=True,
+        required=False,
         widget=forms.Select(),
     )
 
diff --git a/src/registrar/migrations/0116_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py b/src/registrar/migrations/0116_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
new file mode 100644
index 000000000..90623bff9
--- /dev/null
+++ b/src/registrar/migrations/0116_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
@@ -0,0 +1,66 @@
+# Generated by Django 4.2.10 on 2024-08-05 14:33
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0115_portfolioinvitation"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="portfolioinvitation",
+            name="portfolio_additional_permissions",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[
+                        ("view_all_domains", "View all domains and domain reports"),
+                        ("view_managed_domains", "View managed domains"),
+                        ("view_member", "View members"),
+                        ("edit_member", "Create and edit members"),
+                        ("view_all_requests", "View all requests"),
+                        ("view_created_requests", "View created requests"),
+                        ("edit_requests", "Create and edit requests"),
+                        ("view_portfolio", "View organization"),
+                        ("edit_portfolio", "Edit organization"),
+                        ("view_suborganization", "View suborganization"),
+                        ("edit_suborganization", "Edit suborganization"),
+                    ],
+                    max_length=50,
+                ),
+                blank=True,
+                help_text="Select one or more additional permissions.",
+                null=True,
+                size=None,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="portfolio_additional_permissions",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=[
+                        ("view_all_domains", "View all domains and domain reports"),
+                        ("view_managed_domains", "View managed domains"),
+                        ("view_member", "View members"),
+                        ("edit_member", "Create and edit members"),
+                        ("view_all_requests", "View all requests"),
+                        ("view_created_requests", "View created requests"),
+                        ("edit_requests", "Create and edit requests"),
+                        ("view_portfolio", "View organization"),
+                        ("edit_portfolio", "Edit organization"),
+                        ("view_suborganization", "View suborganization"),
+                        ("edit_suborganization", "Edit suborganization"),
+                    ],
+                    max_length=50,
+                ),
+                blank=True,
+                help_text="Select one or more additional permissions.",
+                null=True,
+                size=None,
+            ),
+        ),
+    ]
diff --git a/src/registrar/templates/domain_suborganization.html b/src/registrar/templates/domain_suborganization.html
index 6dbf2f0ff..57ec1d073 100644
--- a/src/registrar/templates/domain_suborganization.html
+++ b/src/registrar/templates/domain_suborganization.html
@@ -16,7 +16,6 @@
     </p>
 
     {% if has_domains_portfolio_permission and request.user.has_edit_suborganization %}
-    {% include "includes/required_fields.html" %}
         <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
             {% csrf_token %}
             {% input_with_errors form.sub_organization %}