mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-21 10:16:13 +02:00
fix first and last name join and lint
This commit is contained in:
parent
7cd2c6fef3
commit
b683bb1d45
2 changed files with 9 additions and 5 deletions
|
@ -5,8 +5,12 @@ from django import forms
|
||||||
from django.core.validators import RegexValidator
|
from django.core.validators import RegexValidator
|
||||||
|
|
||||||
from registrar.models import (
|
from registrar.models import (
|
||||||
PortfolioInvitation, UserPortfolioPermission,
|
PortfolioInvitation,
|
||||||
UserPortfolioPermission, DomainInformation, Portfolio, SeniorOfficial
|
UserPortfolioPermission,
|
||||||
|
UserPortfolioPermission,
|
||||||
|
DomainInformation,
|
||||||
|
Portfolio,
|
||||||
|
SeniorOfficial,
|
||||||
)
|
)
|
||||||
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
|
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
|
||||||
|
|
||||||
|
|
|
@ -153,9 +153,9 @@ def serialize_members(request, portfolio, item, user):
|
||||||
|
|
||||||
# ------- SERIALIZE
|
# ------- SERIALIZE
|
||||||
member_json = {
|
member_json = {
|
||||||
"id": item.get("id",""),
|
"id": item.get("id", ""),
|
||||||
"name": item.get("first_name", "") + " " + item.get("last_name", ""),
|
"name": " ".join(filter(None, [item.get("first_name", ""), item.get("last_name", "")])),
|
||||||
"email": item.get("email",""),
|
"email": item.get("email", ""),
|
||||||
"is_admin": is_admin,
|
"is_admin": is_admin,
|
||||||
"last_active": item.get("last_active", None),
|
"last_active": item.get("last_active", None),
|
||||||
"action_url": action_url,
|
"action_url": action_url,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue