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

fixed null values in response for last_active

Browse source
This commit is contained in:
David Kennedy 2024-10-17 19:04:38 -04:00
parent ef52b6bafc
commit 2a64ac65c0
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/registrar/views/portfolio_members_json.py
View file

@ -62,7 +62,10 @@ def initial_permissions_search(portfolio):
first_name=F("user__first_name"), first_name=F("user__first_name"),
last_name=F("user__last_name"), last_name=F("user__last_name"),
email_display=F("user__email"), email_display=F("user__email"),
last_active=Cast(F("user__last_login"), output_field=TextField()), # Cast last_login to text last_active=Coalesce(
Cast(F("user__last_login"), output_field=TextField()), # Cast last_login to text
Value("Invalid date"), output_field=TextField()
),
member_display=Case( member_display=Case(
# If email is present and not blank, use email # If email is present and not blank, use email
When(Q(user__email__isnull=False) & ~Q(user__email=""), then=F("user__email")), When(Q(user__email__isnull=False) & ~Q(user__email=""), then=F("user__email")),
@ -206,7 +209,7 @@ def serialize_members(request, portfolio, item, user):
], ],
"domain_names": [domain_info.split(":")[1] for domain_info in item.get("domain_info")], "domain_names": [domain_info.split(":")[1] for domain_info in item.get("domain_info")],
"is_admin": is_admin, "is_admin": is_admin,
"last_active": item.get("last_active", ""), "last_active": item.get("last_active"),
"action_url": action_url, "action_url": action_url,
"action_label": ("View" if view_only else "Manage"), "action_label": ("View" if view_only else "Manage"),
"svg_icon": ("visibility" if view_only else "settings"), "svg_icon": ("visibility" if view_only else "settings"),