pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change order of if/elif statement for ApplicationRole display_status

Browse Source 
Since an invite that is expired has a status of 'pending', the ordering
of the if/elif statement needs to be switched so it checks to see if the
invite is expired before seeing if it is pending.
This commit is contained in:
leigh-mil
2019-11-22 09:50:26 -05:00
parent 20a2abd36b
commit d186728526
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
atst/models/application_role.py
View File

@@ -113,19 +113,17 @@ class ApplicationRole(
@property @property
def display_status(self): def display_status(self):
if ( if (
self.is_pending
and self.latest_invitation
and self.latest_invitation.is_pending
):
return "invite_pending"
elif (
self.is_pending self.is_pending
and self.latest_invitation and self.latest_invitation
and self.latest_invitation.is_expired and self.latest_invitation.is_expired
): ):
return "invite_expired" return "invite_expired"
elif (
self.is_pending
and self.latest_invitation
and self.latest_invitation.is_pending
):
return "invite_pending"
elif self.is_active and any( elif self.is_active and any(
env_role.is_pending for env_role in self.environment_roles env_role.is_pending for env_role in self.environment_roles
): ):