mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-27 21:16:28 +02:00
hide portfolio fields for analysts if no waffle flag
This commit is contained in:
parent
661d2d7a22
commit
0c8307c07e
1 changed files with 52 additions and 6 deletions
|
@ -701,9 +701,6 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
|
||||||
|
|
||||||
readonly_fields = ("verification_type",)
|
readonly_fields = ("verification_type",)
|
||||||
|
|
||||||
# Hide Username (uuid), Groups and Permissions
|
|
||||||
# Q: Now that we're using Groups and Permissions,
|
|
||||||
# do we expose those to analysts to view?
|
|
||||||
analyst_fieldsets = (
|
analyst_fieldsets = (
|
||||||
(
|
(
|
||||||
None,
|
None,
|
||||||
|
@ -730,6 +727,30 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
|
||||||
("Important dates", {"fields": ("last_login", "date_joined")}),
|
("Important dates", {"fields": ("last_login", "date_joined")}),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO: delete after we merge organization feature
|
||||||
|
analyst_fieldsets_no_portfolio = (
|
||||||
|
(
|
||||||
|
None,
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"status",
|
||||||
|
"verification_type",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
("User profile", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
|
||||||
|
(
|
||||||
|
"Permissions",
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"is_active",
|
||||||
|
"groups",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
("Important dates", {"fields": ("last_login", "date_joined")}),
|
||||||
|
)
|
||||||
|
|
||||||
analyst_list_display = [
|
analyst_list_display = [
|
||||||
"email",
|
"email",
|
||||||
"first_name",
|
"first_name",
|
||||||
|
@ -759,6 +780,23 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
|
||||||
"portfolio_additional_permissions",
|
"portfolio_additional_permissions",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# TODO: delete after we merge organization feature
|
||||||
|
analyst_readonly_fields_no_portfolio = [
|
||||||
|
"User profile",
|
||||||
|
"first_name",
|
||||||
|
"middle_name",
|
||||||
|
"last_name",
|
||||||
|
"title",
|
||||||
|
"email",
|
||||||
|
"phone",
|
||||||
|
"Permissions",
|
||||||
|
"is_active",
|
||||||
|
"groups",
|
||||||
|
"Important dates",
|
||||||
|
"last_login",
|
||||||
|
"date_joined",
|
||||||
|
]
|
||||||
|
|
||||||
list_filter = (
|
list_filter = (
|
||||||
"is_active",
|
"is_active",
|
||||||
"groups",
|
"groups",
|
||||||
|
@ -831,8 +869,12 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
|
||||||
# Show all fields for all access users
|
# Show all fields for all access users
|
||||||
return super().get_fieldsets(request, obj)
|
return super().get_fieldsets(request, obj)
|
||||||
elif request.user.has_perm("registrar.analyst_access_permission"):
|
elif request.user.has_perm("registrar.analyst_access_permission"):
|
||||||
|
if flag_is_active(request, "organization_feature"):
|
||||||
# show analyst_fieldsets for analysts
|
# show analyst_fieldsets for analysts
|
||||||
return self.analyst_fieldsets
|
return self.analyst_fieldsets
|
||||||
|
else:
|
||||||
|
# TODO: delete after we merge organization feature
|
||||||
|
return self.analyst_fieldsets_no_portfolio
|
||||||
else:
|
else:
|
||||||
# any admin user should belong to either full_access_group
|
# any admin user should belong to either full_access_group
|
||||||
# or cisa_analyst_group
|
# or cisa_analyst_group
|
||||||
|
@ -846,7 +888,11 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
|
||||||
else:
|
else:
|
||||||
# Return restrictive Read-only fields for analysts and
|
# Return restrictive Read-only fields for analysts and
|
||||||
# users who might not belong to groups
|
# users who might not belong to groups
|
||||||
|
if flag_is_active(request, "organization_feature"):
|
||||||
return self.analyst_readonly_fields
|
return self.analyst_readonly_fields
|
||||||
|
else:
|
||||||
|
# TODO: delete after we merge organization feature
|
||||||
|
return self.analyst_readonly_fields_no_portfolio
|
||||||
|
|
||||||
def change_view(self, request, object_id, form_url="", extra_context=None):
|
def change_view(self, request, object_id, form_url="", extra_context=None):
|
||||||
"""Add user's related domains and requests to context"""
|
"""Add user's related domains and requests to context"""
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue