diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 0e86e7764..393cdf23d 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2,19 +2,17 @@ from datetime import date
import logging
from django import forms
from django.db.models.functions import Concat
-from django.http import HttpResponse
-from dateutil.relativedelta import relativedelta
+from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import redirect
from django_fsm import get_available_FIELD_transitions
from django.contrib import admin, messages
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import Group
from django.contrib.contenttypes.models import ContentType
-from django.http.response import HttpResponseRedirect
from django.urls import reverse
+from dateutil.relativedelta import relativedelta # type: ignore
from epplibwrapper.errors import ErrorCode, RegistryError
-from registrar.models.domain import Domain
-from registrar.models.user import User
+from registrar.models import Domain, User
from registrar.utility import csv_export
from registrar.views.utility.mixins import OrderableFieldsMixin
from django.contrib.admin.views.main import ORDER_VAR
@@ -1170,15 +1168,14 @@ class DomainAdmin(ListHeaderAdmin):
# "catch up" to the current year, so we add the difference.
# If both years match, then lets just proceed as normal.
calculated_exp_date = exp_date + relativedelta(years=1)
- years = 1
- if desired_date > calculated_exp_date:
- year_difference = desired_date.year - exp_date.year
- years = year_difference
+
+ year_difference = desired_date.year - exp_date.year
+ # Max probably isn't needed here (no code flow), but it guards against negative and 0.
+ years = max(1, year_difference) if desired_date > calculated_exp_date else 1
# Renew the domain.
try:
obj.renew_domain(length=years)
-
self.message_user(
request,
"Successfully extended the expiration date.",
@@ -1188,7 +1185,6 @@ class DomainAdmin(ListHeaderAdmin):
error_message = "Error connecting to the registry."
else:
error_message = f"Error extending this domain: {err}."
-
self.message_user(request, error_message, messages.ERROR)
except KeyError:
# In normal code flow, a keyerror can only occur when
@@ -1362,13 +1358,6 @@ class DomainAdmin(ListHeaderAdmin):
return True
return super().has_change_permission(request, obj)
- def changelist_view(self, request, extra_context=None):
- extra_context = extra_context or {}
- # Create HTML for the modal button
- modal_button = ''
- extra_context["modal_button"] = modal_button
- return super().changelist_view(request, extra_context=extra_context)
-
class DraftDomainAdmin(ListHeaderAdmin):
"""Custom draft domain admin class."""
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index 28ae01aec..fbb3380a7 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -44,58 +44,71 @@
{% endblock %}
{% block submit_buttons_bottom %}
-
-
-
-
- Are you sure you want to extend this expiration date?
-
-
-
- This action will extend the expiration date by a year.
-
-
-
-
-
-
+ {% comment %}
+ Modals behave very weirdly in django admin.
+ They tend to "strip out" any injected form elements, leaving only the main form.
+ In addition, USWDS handles modals by first destroying the element, then repopulating it toward the end of the page.
+ In effect, this means that the modal is not, and cannot, be surrounded by any form element at compile time.
+
+ The current workaround for this is to use javascript to inject a hidden input, and bind submit of that
+ element to the click of the confirmation button within this modal.
+
+ This is controlled by the class `dja-form-placeholder` on the button.
+
+ In addition, the modal element MUST be placed low in the DOM. The script loads slower on DJA than on other portions
+ of the application, so this means that it will briefly "populate", causing unintended visual effects.
+ {% endcomment %}
+
+
+
+
+ Are you sure you want to extend this expiration date?
+
+
+
+ This action will extend the expiration date by a year.
+
+
+
+
+
+
+
{{ block.super }}
{% endblock %}
\ No newline at end of file