Auto stash before cherry pick of "Merge pull request #1843 from cisagov/nl/1798-update-email-signature"

First pass of searching remaining instances of "application"
This commit is contained in:
CocoByte 2024-02-29 20:28:05 -07:00
parent b0ef577869
commit efe3c4e5de
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
22 changed files with 238 additions and 238 deletions

View file

@ -1056,7 +1056,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
def save_model(self, request, obj, form, change):
if obj and obj.creator.status != models.User.RESTRICTED:
if change: # Check if the domain request is being edited
# Get the original application from the database
# Get the original domain request from the database
original_obj = models.DomainRequest.objects.get(pk=obj.pk)
if (
@ -1065,7 +1065,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
and obj.status != models.DomainRequest.DomainRequestStatus.APPROVED
and not obj.domain_is_not_active()
):
# If an admin tried to set an approved application to
# If an admin tried to set an approved domain request to
# another status and the related domain is already
# active, shortcut the action and throw a friendly
# error message. This action would still not go through
@ -1127,7 +1127,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
messages.error(
request,
"This action is not permitted for applications with a restricted creator.",
"This action is not permitted for domain requests with a restricted creator.",
)
def get_readonly_fields(self, request, obj=None):