remove accepted column from workspace_roles
This commit is contained in:
@@ -49,6 +49,6 @@ class Workspace(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
|
||||
return self.id
|
||||
|
||||
def __repr__(self):
|
||||
return "<Workspace(name='{}', request='{}', task_order='{}', user_count='{}', id='{}')>".format(
|
||||
self.name, self.request_id, self.task_order.number, self.user_count, self.id
|
||||
return "<Workspace(name='{}', request='{}', user_count='{}', id='{}')>".format(
|
||||
self.name, self.request_id, self.user_count, self.id
|
||||
)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
from sqlalchemy import Index, ForeignKey, Column, Boolean
|
||||
from sqlalchemy import Index, ForeignKey, Column
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
@@ -22,8 +22,6 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
|
||||
UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False
|
||||
)
|
||||
|
||||
accepted = Column(Boolean)
|
||||
|
||||
def __repr__(self):
|
||||
return "<WorkspaceRole(role='{}', workspace='{}', user_id='{}', id='{}')>".format(
|
||||
self.role.name, self.workspace.name, self.user_id, self.id
|
||||
|
@@ -12,9 +12,7 @@ class WorkspaceUser(object):
|
||||
def permissions(self):
|
||||
atat_permissions = set(self.user.atat_role.permissions)
|
||||
workspace_permissions = (
|
||||
[]
|
||||
if self.workspace_role is None or not self.is_accepted
|
||||
else self.workspace_role.role.permissions
|
||||
[] if self.workspace_role is None else self.workspace_role.role.permissions
|
||||
)
|
||||
return set(workspace_permissions).union(atat_permissions)
|
||||
|
||||
@@ -81,10 +79,3 @@ class WorkspaceUser(object):
|
||||
self.workspace.name,
|
||||
self.num_environment_roles,
|
||||
)
|
||||
|
||||
@property
|
||||
def is_accepted(self):
|
||||
if self.workspace_role:
|
||||
return self.workspace_role.accepted
|
||||
|
||||
return False
|
||||
|
Reference in New Issue
Block a user