Merge branch 'master' into record-user-that-requested-to-go-live

This commit is contained in:
Chris Hill-Scott
2019-04-23 15:38:44 +01:00
committed by GitHub
51 changed files with 733 additions and 550 deletions

View File

@@ -114,8 +114,12 @@ class Service(JSONModel):
@cached_property
def has_team_members(self):
return user_api_client.get_count_of_users_with_permission(
self.id, 'manage_service'
return (
user_api_client.get_count_of_users_with_permission(
self.id, 'manage_service'
) + invite_api_client.get_count_of_invites_with_permission(
self.id, 'manage_service'
)
) > 1
def cancel_invite(self, invited_user_id):