Allow filtering by all member statuses in member list view

2018-11-12 17:11:45 -05:00
parent 947106a5b1
commit 990c24b802
5 changed files with 32 additions and 11 deletions
--- a/atst/models/workspace_role.py
+++ b/atst/models/workspace_role.py
@@ -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"