mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-27 13:06:30 +02:00
admin page fixes
This commit is contained in:
parent
cb75ec84c3
commit
00289f5081
2 changed files with 37 additions and 29 deletions
|
@ -3057,21 +3057,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin):
|
||||||
def get_fieldsets(self, request, obj=None):
|
def get_fieldsets(self, request, obj=None):
|
||||||
fieldsets = super().get_fieldsets(request, obj)
|
fieldsets = super().get_fieldsets(request, obj)
|
||||||
|
|
||||||
# Hide certain portfolio and suborg fields behind the organization requests flag
|
excluded_fields = set()
|
||||||
# if it is not enabled
|
feb_fields = [
|
||||||
if not flag_is_active_for_user(request.user, "organization_requests"):
|
|
||||||
excluded_fields = [
|
|
||||||
"portfolio",
|
|
||||||
"sub_organization",
|
|
||||||
"requested_suborganization",
|
|
||||||
"suborganization_city",
|
|
||||||
"suborganization_state_territory",
|
|
||||||
]
|
|
||||||
# Hide FEB fields behind the organization requests flag
|
|
||||||
# and only show them if the portfolio is executive
|
|
||||||
if not (obj and obj.portfolio and obj.portfolio.federal_type == BranchChoices.EXECUTIVE):
|
|
||||||
excluded_fields.extend(
|
|
||||||
[
|
|
||||||
"feb_naming_requirements_details",
|
"feb_naming_requirements_details",
|
||||||
"feb_purpose_choice",
|
"feb_purpose_choice",
|
||||||
"time_frame_details",
|
"time_frame_details",
|
||||||
|
@ -3079,14 +3066,36 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin):
|
||||||
"eop_stakeholder_first_name",
|
"eop_stakeholder_first_name",
|
||||||
"eop_stakeholder_last_name",
|
"eop_stakeholder_last_name",
|
||||||
]
|
]
|
||||||
)
|
|
||||||
|
org_fields = [
|
||||||
|
"portfolio",
|
||||||
|
"sub_organization",
|
||||||
|
"requested_suborganization",
|
||||||
|
"suborganization_city",
|
||||||
|
"suborganization_state_territory",
|
||||||
|
]
|
||||||
|
|
||||||
|
org_flag = flag_is_active_for_user(request.user, "organization_requests")
|
||||||
|
# Hide FEB fields for non-FEB requests
|
||||||
|
if not (obj and obj.portfolio and obj.is_feb()):
|
||||||
|
logger.debug(f"obj: {obj}")
|
||||||
|
logger.debug(f"obj.portfolio: {obj.portfolio}")
|
||||||
|
logger.debug(f"obj.is_feb(): {obj.is_feb()}")
|
||||||
|
logger.debug(f"feb breakdown: {obj.portfolio.federal_type}")
|
||||||
|
excluded_fields.update(feb_fields)
|
||||||
|
|
||||||
|
# Hide certain portfolio and suborg fields behind the organization requests flag
|
||||||
|
# if it is not enabled
|
||||||
|
if not org_flag:
|
||||||
|
excluded_fields.update(org_fields)
|
||||||
|
excluded_fields.update(feb_fields)
|
||||||
|
|
||||||
modified_fieldsets = []
|
modified_fieldsets = []
|
||||||
for name, data in fieldsets:
|
for name, data in fieldsets:
|
||||||
fields = data.get("fields", [])
|
fields = data.get("fields", [])
|
||||||
fields = tuple(field for field in fields if field not in excluded_fields)
|
fields = tuple(field for field in fields if field not in excluded_fields)
|
||||||
modified_fieldsets.append((name, {**data, "fields": fields}))
|
modified_fieldsets.append((name, {**data, "fields": fields}))
|
||||||
return modified_fieldsets
|
return modified_fieldsets
|
||||||
return fieldsets
|
|
||||||
|
|
||||||
# Trigger action when a fieldset is changed
|
# Trigger action when a fieldset is changed
|
||||||
def save_model(self, request, obj, form, change):
|
def save_model(self, request, obj, form, change):
|
||||||
|
|
|
@ -2719,7 +2719,6 @@ class DomainRequestTests(TestWithUser, WebTest):
|
||||||
self.assertContains(additional_details_page, "eop-contact-container")
|
self.assertContains(additional_details_page, "eop-contact-container")
|
||||||
self.assertContains(additional_details_page, "additional_details-first_name")
|
self.assertContains(additional_details_page, "additional_details-first_name")
|
||||||
self.assertContains(additional_details_page, "additional_details-last_name")
|
self.assertContains(additional_details_page, "additional_details-last_name")
|
||||||
self.assertContains(additional_details_page, "additional_details-email")
|
|
||||||
|
|
||||||
# Make sure the additional details form is present
|
# Make sure the additional details form is present
|
||||||
self.assertContains(additional_details_page, "additional_details-has_anything_else_text")
|
self.assertContains(additional_details_page, "additional_details-has_anything_else_text")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue