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

safer handling of None values in json view

Browse source
This commit is contained in:
David Kennedy 2024-10-11 11:15:43 -04:00
parent a31c5ebe31
commit 5c305c8557
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,9 +89,9 @@ def apply_search(data_list, request):
data_list = [ data_list = [
item item
for item in data_list for item in data_list
if search_term in (item.get("first_name", "") or "").lower() if search_term in item.get("first_name", "").lower()
or search_term in (item.get("last_name", "") or "").lower() or search_term in item.get("last_name", "").lower()
or search_term in (item.get("email", "") or "").lower() or search_term in item.get("email", "").lower()
] ]
return data_list return data_list
@ -153,11 +153,11 @@ def serialize_members(request, portfolio, item, user):
# ------- SERIALIZE # ------- SERIALIZE
member_json = { member_json = {
"id": item["id"], "id": item.get("id",""),
"name": (item["first_name"] or "") + " " + (item["last_name"] or ""), "name": item.get("first_name", "") + " " + item.get("last_name", ""),
"email": item["email"], "email": item.get("email",""),
"is_admin": is_admin, "is_admin": is_admin,
"last_active": item["last_active"], "last_active": item.get("last_active", None),
"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"),