Merge branch 'main' into za/1947-contact-info-domain-information-inline

This commit is contained in:
zandercymatics 2024-04-11 11:18:26 -06:00
commit d33742cfc8
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 67 additions and 16 deletions

View file

@ -1634,12 +1634,8 @@ class DomainAdmin(ListHeaderAdmin):
# No expiration date was found. Return none.
extra_context["extended_expiration_date"] = None
return super().changeform_view(request, object_id, form_url, extra_context)
if curr_exp_date < date.today():
extra_context["extended_expiration_date"] = date.today() + relativedelta(years=years_to_extend_by)
else:
new_date = domain.registry_expiration_date + relativedelta(years=years_to_extend_by)
extra_context["extended_expiration_date"] = new_date
new_date = curr_exp_date + relativedelta(years=years_to_extend_by)
extra_context["extended_expiration_date"] = new_date
else:
extra_context["extended_expiration_date"] = None