From c99b9adc15f0afceeaa96ba723733a7cb0326968 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 20 Mar 2024 17:43:54 -0400 Subject: [PATCH] merge main --- ...ct_fax_alter_publiccontact_org_and_more.py | 35 +++++++++++++++++++ ...ninformation_generic_org_type_and_more.py} | 2 +- src/registrar/models/public_contact.py | 7 ++-- 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/registrar/migrations/0077_alter_publiccontact_fax_alter_publiccontact_org_and_more.py rename src/registrar/migrations/{0077_rename_organization_type_domaininformation_generic_org_type_and_more.py => 0078_rename_organization_type_domaininformation_generic_org_type_and_more.py} (88%) diff --git a/src/registrar/migrations/0077_alter_publiccontact_fax_alter_publiccontact_org_and_more.py b/src/registrar/migrations/0077_alter_publiccontact_fax_alter_publiccontact_org_and_more.py new file mode 100644 index 000000000..66c904391 --- /dev/null +++ b/src/registrar/migrations/0077_alter_publiccontact_fax_alter_publiccontact_org_and_more.py @@ -0,0 +1,35 @@ +# Generated by Django 4.2.10 on 2024-03-15 18:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0076_alter_domainrequest_current_websites_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="publiccontact", + name="fax", + field=models.CharField( + blank=True, help_text="Contact's fax number (null ok). Must be in ITU.E164.2005 format.", null=True + ), + ), + migrations.AlterField( + model_name="publiccontact", + name="org", + field=models.CharField(blank=True, help_text="Contact's organization (null ok)", null=True), + ), + migrations.AlterField( + model_name="publiccontact", + name="street2", + field=models.CharField(blank=True, help_text="Contact's street (null ok)", null=True), + ), + migrations.AlterField( + model_name="publiccontact", + name="street3", + field=models.CharField(blank=True, help_text="Contact's street (null ok)", null=True), + ), + ] diff --git a/src/registrar/migrations/0077_rename_organization_type_domaininformation_generic_org_type_and_more.py b/src/registrar/migrations/0078_rename_organization_type_domaininformation_generic_org_type_and_more.py similarity index 88% rename from src/registrar/migrations/0077_rename_organization_type_domaininformation_generic_org_type_and_more.py rename to src/registrar/migrations/0078_rename_organization_type_domaininformation_generic_org_type_and_more.py index 79d9a71b4..fb9d65cce 100644 --- a/src/registrar/migrations/0077_rename_organization_type_domaininformation_generic_org_type_and_more.py +++ b/src/registrar/migrations/0078_rename_organization_type_domaininformation_generic_org_type_and_more.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ("registrar", "0076_alter_domainrequest_current_websites_and_more"), + ("registrar", "0077_alter_publiccontact_fax_alter_publiccontact_org_and_more"), ] operations = [ diff --git a/src/registrar/models/public_contact.py b/src/registrar/models/public_contact.py index cdd0d6a42..f9dea3f02 100644 --- a/src/registrar/models/public_contact.py +++ b/src/registrar/models/public_contact.py @@ -60,10 +60,10 @@ class PublicContact(TimeStampedModel): ) name = models.CharField(null=False, help_text="Contact's full name") - org = models.CharField(null=True, help_text="Contact's organization (null ok)") + org = models.CharField(null=True, blank=True, help_text="Contact's organization (null ok)") street1 = models.CharField(null=False, help_text="Contact's street") - street2 = models.CharField(null=True, help_text="Contact's street (null ok)") - street3 = models.CharField(null=True, help_text="Contact's street (null ok)") + street2 = models.CharField(null=True, blank=True, help_text="Contact's street (null ok)") + street3 = models.CharField(null=True, blank=True, help_text="Contact's street (null ok)") city = models.CharField(null=False, help_text="Contact's city") sp = models.CharField(null=False, help_text="Contact's state or province") pc = models.CharField(null=False, help_text="Contact's postal code") @@ -72,6 +72,7 @@ class PublicContact(TimeStampedModel): voice = models.CharField(null=False, help_text="Contact's phone number. Must be in ITU.E164.2005 format") fax = models.CharField( null=True, + blank=True, help_text="Contact's fax number (null ok). Must be in ITU.E164.2005 format.", ) pw = models.CharField(null=False, help_text="Contact's authorization code. 16 characters minimum.")