From e8fe34562cf275d344fa21d45874dcc0be5e9c93 Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Wed, 31 May 2023 10:51:10 -0400 Subject: [PATCH 1/3] Added exception for school fixing #524 --- src/registrar/models/domain_application.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 3859e04a7..c157372b1 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -567,6 +567,7 @@ class DomainApplication(TimeStampedModel): excluded = [ DomainApplication.OrganizationChoices.FEDERAL, DomainApplication.OrganizationChoices.INTERSTATE, + DomainApplication.OrganizationChoices.SCHOOL_DISTRICT ] return bool(user_choice and user_choice not in excluded) From 6c48a0be132a1fc9b332b5c0a0a19976db6a850f Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Wed, 31 May 2023 10:52:34 -0400 Subject: [PATCH 2/3] Added comment --- src/registrar/models/domain_application.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index c157372b1..47139cfc0 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -562,6 +562,7 @@ class DomainApplication(TimeStampedModel): """Show this step if the answer to the first question implies it. This shows for answers that aren't "Federal" or "Interstate". + This also doesnt show if user selected "School District" as well (#524) """ user_choice = self.organization_type excluded = [ From 40eee950ece9e441852766c56fb096cce0c3214c Mon Sep 17 00:00:00 2001 From: Jon Roberts Date: Wed, 31 May 2023 11:15:36 -0400 Subject: [PATCH 3/3] Linted --- src/registrar/models/domain_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 47139cfc0..1ff551bea 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -568,7 +568,7 @@ class DomainApplication(TimeStampedModel): excluded = [ DomainApplication.OrganizationChoices.FEDERAL, DomainApplication.OrganizationChoices.INTERSTATE, - DomainApplication.OrganizationChoices.SCHOOL_DISTRICT + DomainApplication.OrganizationChoices.SCHOOL_DISTRICT, ] return bool(user_choice and user_choice not in excluded)