zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 20:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

review changes

Browse source
This commit is contained in:
matthewswspence 2025-03-11 10:48:54 -05:00
parent 9ddf7a6cd0
commit b09f68946f
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
4 changed files with 30 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/registrar/migrations/0141_domainrequest_feb_naming_requirements_and_more.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.17 on 2025-02-13 22:41
# Generated by Django 4.2.17 on 2025-03-10 19:55
from django.db import migrations, models
@ -20,4 +20,31 @@ class Migration(migrations.Migration):
name="feb_naming_requirements_details",
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="feb_purpose_choice",
field=models.CharField(
blank=True, choices=[("website", "Website"), ("redirect", "Redirect"), ("other", "Other")], null=True
),
),
migrations.AddField(
model_name="domainrequest",
name="has_timeframe",
field=models.BooleanField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="interagency_initiative_details",
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="is_interagency_initiative",
field=models.BooleanField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="time_frame_details",
field=models.TextField(blank=True, null=True),
),
]

40
src/registrar/migrations/0142_domainrequest_feb_purpose_choice_and_more.py
View file

@ -1,40 +0,0 @@
# Generated by Django 4.2.17 on 2025-02-25 23:45
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("registrar", "0141_domainrequest_feb_naming_requirements_and_more"),
]
operations = [
migrations.AddField(
model_name="domainrequest",
name="feb_purpose_choice",
field=models.CharField(
blank=True, choices=[("website", "Website"), ("redirect", "Redirect"), ("other", "Other")], null=True
),
),
migrations.AddField(
model_name="domainrequest",
name="has_timeframe",
field=models.BooleanField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="interagency_initiative_details",
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="is_interagency_initiative",
field=models.BooleanField(blank=True, null=True),
),
migrations.AddField(
model_name="domainrequest",
name="time_frame_details",
field=models.TextField(blank=True, null=True),
),
]

8
src/registrar/models/domain_request.py
View file

@ -1436,13 +1436,9 @@ class DomainRequest(TimeStampedModel):
def is_feb(self) -> bool:
"""Is this domain request for a Federal Executive Branch agency?"""
if not self.generic_org_type:
# generic_org_type is either blank or None, assume no
return False
if self.generic_org_type == DomainRequest.OrganizationChoices.FEDERAL:
return self.federal_type == BranchChoices.EXECUTIVE
if self.portfolio:
return self.portfolio.federal_type == BranchChoices.EXECUTIVE
return False
def is_federal(self) -> Union[bool, None]:
"""Is this domain request for a federal agency?

4
src/registrar/views/domain_request.py
View file

@ -232,9 +232,6 @@ class DomainRequestWizard(TemplateView):
if portfolio and not self._domain_request.generic_org_type:
self._domain_request.generic_org_type = portfolio.organization_type
self._domain_request.save()
if portfolio and not self._domain_request.federal_type:
self._domain_request.federal_type = portfolio.federal_type
self._domain_request.save()
else:
self._domain_request = DomainRequest.objects.create(creator=self.request.user)
return self._domain_request
@ -474,7 +471,6 @@ class DomainRequestWizard(TemplateView):
"requested_domain__name": requested_domain_name,
}
context["domain_request_id"] = self.domain_request.id
context["is_executive"] = self.domain_request.is_federal() and self.domain_request.federal_type == "Executive"
return context
def get_step_list(self) -> list: