pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify User model string serialization.

Browse Source 
There was a leftover method listing all the portfolios a user has access
to inside the string-serialization for the User. This is too verbose.
The leftover method was not being used anywhere else, so it was removed.
This commit is contained in:
dandds
2019-09-04 13:03:09 -04:00
parent dfb4536b5d
commit e259e7e440
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
atst/models/user.py
View File

@@ -4,7 +4,6 @@ from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.event import listen from sqlalchemy.event import listen
from atst.models import Base, ApplicationRole, types, mixins from atst.models import Base, ApplicationRole, types, mixins
from atst.models.permissions import Permissions
from atst.models.portfolio_invitation import PortfolioInvitation from atst.models.portfolio_invitation import PortfolioInvitation
from atst.models.application_invitation import ApplicationInvitation from atst.models.application_invitation import ApplicationInvitation
from atst.models.mixins.auditable import ( from atst.models.mixins.auditable import (
@@ -97,10 +96,6 @@ class User(
def full_name(self): def full_name(self):
return "{} {}".format(self.first_name, self.last_name) return "{} {}".format(self.first_name, self.last_name)
@property
def has_portfolios(self):
return (Permissions.VIEW_PORTFOLIO in self.permissions) or self.portfolio_roles
@property @property
def displayname(self): def displayname(self):
return self.full_name return self.full_name
@@ -114,8 +109,8 @@ class User(
return None return None
def __repr__(self): def __repr__(self):
return "<User(name='{}', dod_id='{}', email='{}', has_portfolios='{}', id='{}')>".format( return "<User(name='{}', dod_id='{}', email='{}', id='{}')>".format(
self.full_name, self.dod_id, self.email, self.has_portfolios, self.id self.full_name, self.dod_id, self.email, self.id
) )
def to_dictionary(self): def to_dictionary(self):