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

Merge branch 'za/1676-require-investigator-da' into za/1676-alternative-approach

Browse source
This commit is contained in:
zandercymatics 2024-02-26 13:03:44 -07:00
commit d11c80e263
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/registrar/admin.py
View file

@ -840,6 +840,10 @@ class DomainApplicationAdminForm(forms.ModelForm):
status = cleaned_data.get("status") status = cleaned_data.get("status")
investigator = cleaned_data.get("investigator") investigator = cleaned_data.get("investigator")
# Get the old status
initial_status = self.initial.get("status", None)
# We only care about investigator when in these statuses
checked_statuses = [ checked_statuses = [
DomainApplication.ApplicationStatus.APPROVED, DomainApplication.ApplicationStatus.APPROVED,
DomainApplication.ApplicationStatus.IN_REVIEW, DomainApplication.ApplicationStatus.IN_REVIEW,
@ -847,11 +851,13 @@ class DomainApplicationAdminForm(forms.ModelForm):
DomainApplication.ApplicationStatus.REJECTED, DomainApplication.ApplicationStatus.REJECTED,
DomainApplication.ApplicationStatus.INELIGIBLE DomainApplication.ApplicationStatus.INELIGIBLE
] ]
# Checks the "investigators" field for validity.
# That field must obey certain conditions when an application is approved. # If a status change occured, check for validity
# Will call "add_error" if any issues are found. if status != initial_status and status in checked_statuses:
#if status in checked_statuses: # Checks the "investigators" field for validity.
#self._check_for_valid_investigator(investigator) # That field must obey certain conditions when an application is approved.
# Will call "add_error" if any issues are found.
self._check_for_valid_investigator(investigator)
return cleaned_data return cleaned_data
@ -866,6 +872,7 @@ class DomainApplicationAdminForm(forms.ModelForm):
# Check if an investigator is assigned. No approval is possible without one. # Check if an investigator is assigned. No approval is possible without one.
error_message = None error_message = None
if investigator is None: if investigator is None:
# Lets grab the error message from a common location
error_message = ApplicationStatusError.get_error_message(FSMErrorCodes.NO_INVESTIGATOR) error_message = ApplicationStatusError.get_error_message(FSMErrorCodes.NO_INVESTIGATOR)
elif not investigator.is_staff: elif not investigator.is_staff:
error_message = ApplicationStatusError.get_error_message(FSMErrorCodes.INVESTIGATOR_NOT_STAFF) error_message = ApplicationStatusError.get_error_message(FSMErrorCodes.INVESTIGATOR_NOT_STAFF)