rename portfolio_role -> permission_sets join table, remove older roles property
This commit is contained in:
parent
b0e48134b0
commit
762d2289a3
@ -29,7 +29,7 @@ class Status(Enum):
|
|||||||
PENDING = "pending"
|
PENDING = "pending"
|
||||||
|
|
||||||
|
|
||||||
portfolio_roles_roles = Table(
|
portfolio_roles_permission_sets = Table(
|
||||||
"portfolio_roles_permission_sets",
|
"portfolio_roles_permission_sets",
|
||||||
Base.metadata,
|
Base.metadata,
|
||||||
Column("portfolio_role_id", UUID(as_uuid=True), ForeignKey("portfolio_roles.id")),
|
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)
|
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
|
@property
|
||||||
def permissions(self):
|
def permissions(self):
|
||||||
@ -117,10 +119,6 @@ class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
|
|||||||
def user_name(self):
|
def user_name(self):
|
||||||
return self.user.full_name
|
return self.user.full_name
|
||||||
|
|
||||||
@property
|
|
||||||
def role_displayname(self):
|
|
||||||
return self.role.display_name
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_active(self):
|
def is_active(self):
|
||||||
return self.status == Status.ACTIVE
|
return self.status == Status.ACTIVE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user