From 762d2289a33238fb2fa9f70767eac3f5e6f17732 Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 14 Mar 2019 14:57:27 -0400 Subject: [PATCH] rename portfolio_role -> permission_sets join table, remove older roles property --- atst/models/portfolio_role.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/atst/models/portfolio_role.py b/atst/models/portfolio_role.py index be9a6983..eb589157 100644 --- a/atst/models/portfolio_role.py +++ b/atst/models/portfolio_role.py @@ -29,7 +29,7 @@ class Status(Enum): PENDING = "pending" -portfolio_roles_roles = Table( +portfolio_roles_permission_sets = Table( "portfolio_roles_permission_sets", Base.metadata, Column("portfolio_role_id", UUID(as_uuid=True), ForeignKey("portfolio_roles.id")), @@ -52,7 +52,9 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin): status = Column(SQLAEnum(Status, native_enum=False), default=Status.PENDING) - permission_sets = relationship("PermissionSet", secondary=portfolio_roles_roles) + permission_sets = relationship( + "PermissionSet", secondary=portfolio_roles_permission_sets + ) @property def permissions(self): @@ -117,10 +119,6 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin): def user_name(self): return self.user.full_name - @property - def role_displayname(self): - return self.role.display_name - @property def is_active(self): return self.status == Status.ACTIVE