zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-03 00:12:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rh/3363-uat-1-bug-fixes' of https://github.com/cisagov/manage.get.gov into rh/3363-uat-1-bug-fixes

Browse source
This commit is contained in:
Rebecca Hsieh 2025-01-28 16:52:14 -08:00
commit 6fd922edf1
No known key found for this signature in database
3 changed files with 3 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/models/user.py
View file

@ -171,11 +171,14 @@ class User(AbstractUser):
now = timezone.now().date()
expiration_window = 60
threshold_date = now + timedelta(days=expiration_window)
acceptable_statuses = [Domain.State.UNKNOWN, Domain.State.DNS_NEEDED, Domain.State.READY]
num_of_expiring_domains = Domain.objects.filter(
id__in=domain_ids,
expiration_date__isnull=False,
expiration_date__lte=threshold_date,
expiration_date__gt=now,
state__in=acceptable_statuses,
).count()
return num_of_expiring_domains

3
src/registrar/views/domain.py
View file

@ -327,9 +327,6 @@ class DomainRenewalView(DomainBaseView):
context["hidden_security_emails"] = default_emails
security_email = self.object.get_security_email()
if security_email is None or security_email in default_emails:
context["security_email"] = None
return context
context["security_email"] = security_email
return context