Fix bug in application member deletion

This commit is contained in:
richard-dds
2019-06-10 16:43:47 -04:00
parent 0bd9d4bbb6
commit 30ef2a67ef
4 changed files with 33 additions and 12 deletions

View File

@@ -128,15 +128,11 @@ class Applications(BaseDomainClass):
return invitation
@classmethod
def remove_member(cls, application, user_id):
application_role = ApplicationRoles.get(
user_id=user_id, application_id=application.id
)
def remove_member(cls, application_role):
application_role.status = ApplicationRoleStatus.DISABLED
application_role.deleted = True
for env in application.environments:
for env in application_role.application.environments:
EnvironmentRoles.delete(
application_role_id=application_role.id, environment_id=env.id
)

View File

@@ -189,14 +189,15 @@ def create_member(application_id):
def remove_member(application_id, application_role_id):
application_role = ApplicationRoles.get_by_id(application_role_id)
Applications.remove_member(
application=g.application, user_id=application_role.user_id
)
user = Users.get(application_role.user_id)
user_name = "a user"
if application_role.user:
user_name = application_role.user.full_name
Applications.remove_member(application_role)
flash(
"application_member_removed",
user_name=user.full_name,
user_name=user_name,
application_name=g.application.name,
)