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

Add more controls and messaging, unit tests

Browse source
This commit is contained in:
rachidatecs 2023-08-25 12:13:41 -04:00
parent 91d1b9c1cc
commit 6c308332b0
No known key found for this signature in database
GPG key ID: 3CEBBFA7325E5525
2 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/registrar/admin.py
View file

@ -304,39 +304,6 @@ class DomainApplicationAdmin(ListHeaderAdmin):
# Get the original application from the database
original_obj = models.DomainApplication.objects.get(pk=obj.pk)
# if obj.status != original_obj.status:
# if obj.status == models.DomainApplication.STARTED:
# # No conditions
# pass
# elif obj.status == models.DomainApplication.SUBMITTED:
# # This is an fsm in model which will throw an error if the
# # transition condition is violated, so we roll back the
# # status to what it was before the admin user changed it and
# # let the fsm method set it. Same comment applies to
# # transition method calls below.
# obj.status = original_obj.status
# obj.submit()
# elif obj.status == models.DomainApplication.IN_REVIEW:
# obj.status = original_obj.status
# obj.in_review()
# elif obj.status == models.DomainApplication.ACTION_NEEDED:
# obj.status = original_obj.status
# obj.action_needed()
# elif obj.status == models.DomainApplication.APPROVED:
# obj.status = original_obj.status
# obj.approve()
# elif obj.status == models.DomainApplication.WITHDRAWN:
# obj.status = original_obj.status
# obj.withdraw()
# elif obj.status == models.DomainApplication.REJECTED:
# obj.status = original_obj.status
# obj.reject()
# elif obj.status == models.DomainApplication.INELIGIBLE:
# obj.status = original_obj.status
# obj.reject_with_prejudice()
# else:
# logger.warning("Unknown status selected in django admin")
if obj.status != original_obj.status:
status_method_mapping = {
models.DomainApplication.STARTED: None,
@ -352,11 +319,18 @@ class DomainApplicationAdmin(ListHeaderAdmin):
if selected_method is None:
logger.warning("Unknown status selected in django admin")
else:
# This is an fsm in model which will throw an error if the
# transition condition is violated, so we roll back the
# status to what it was before the admin user changed it and
# let the fsm method set it.
obj.status = original_obj.status
selected_method()
super().save_model(request, obj, form, change)
else:
# Clear the success message
messages.set_level(request, messages.ERROR)
messages.error(
request,
"This action is not permitted for applications "
@ -389,6 +363,18 @@ class DomainApplicationAdmin(ListHeaderAdmin):
readonly_fields.extend([field for field in self.analyst_readonly_fields])
return readonly_fields
def display_ineligible_warning(self, request, obj):
if obj and obj.creator.status == "ineligible":
messages.warning(
request,
"Cannot edit an application when its creator has a status of ineligible.",
)
def change_view(self, request, object_id, form_url="", extra_context=None):
obj = self.get_object(request, object_id)
self.display_ineligible_warning(request, obj)
return super().change_view(request, object_id, form_url, extra_context)
admin.site.register(models.User, MyUserAdmin)
admin.site.register(models.UserDomainRole, AuditedAdmin)