Allow filtering by all member statuses in member list view
This commit is contained in:
@@ -9,6 +9,16 @@ from .users import Users
|
||||
from .exceptions import NotFoundError
|
||||
|
||||
|
||||
MEMBER_STATUSES = [
|
||||
{"name": "active", "display_name": "Active"},
|
||||
{"name": "revoked", "display_name": "Revoked"},
|
||||
{"name": "expired", "display_name": "Invite expired"},
|
||||
{"name": "error", "display_name": "Error on invite"},
|
||||
{"name": "pending", "display_name": "Pending"},
|
||||
{"name": "unknown", "display_name": "Unknown errors"},
|
||||
]
|
||||
|
||||
|
||||
class WorkspaceRoles(object):
|
||||
@classmethod
|
||||
def get(cls, workspace_id, user_id):
|
||||
|
@@ -53,11 +53,12 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
|
||||
elif self.latest_invitation:
|
||||
if self.latest_invitation.is_revoked:
|
||||
return "Revoked"
|
||||
elif self.latest_invitation.is_rejected_expired:
|
||||
return "Invite expired"
|
||||
elif self.latest_invitation.is_rejected_wrong_user:
|
||||
return "Error on invite"
|
||||
elif self.latest_invitation.is_expired:
|
||||
elif (
|
||||
self.latest_invitation.is_rejected_expired
|
||||
or self.latest_invitation.is_expired
|
||||
):
|
||||
return "Invite expired"
|
||||
else:
|
||||
return "Pending"
|
||||
|
@@ -14,7 +14,7 @@ from atst.domain.exceptions import UnauthorizedError, AlreadyExistsError
|
||||
from atst.domain.projects import Projects
|
||||
from atst.domain.reports import Reports
|
||||
from atst.domain.workspaces import Workspaces
|
||||
from atst.domain.workspace_roles import WorkspaceRoles
|
||||
from atst.domain.workspace_roles import WorkspaceRoles, MEMBER_STATUSES
|
||||
from atst.domain.environments import Environments
|
||||
from atst.domain.environment_roles import EnvironmentRoles
|
||||
from atst.forms.project import NewProjectForm, ProjectForm
|
||||
@@ -124,6 +124,7 @@ def workspace_members(workspace_id):
|
||||
"workspaces/members/index.html",
|
||||
workspace=workspace,
|
||||
role_choices=WORKSPACE_ROLE_DEFINITIONS,
|
||||
status_choices=MEMBER_STATUSES,
|
||||
members=members_list,
|
||||
new_member=new_member,
|
||||
)
|
||||
|
Reference in New Issue
Block a user