display message for successfully updating environment role / access

This commit is contained in:
dandds
2018-12-12 11:39:58 -05:00
parent 2218b180a5
commit a75c19188f
5 changed files with 51 additions and 6 deletions

View File

@@ -65,6 +65,7 @@ class Environments(object):
Permissions.ADD_AND_ASSIGN_CSP_ROLES,
"assign environment roles",
)
updated = False
for id_and_role in ids_and_roles:
new_role = id_and_role["role"]
@@ -72,19 +73,24 @@ class Environments(object):
if new_role is None:
EnvironmentRoles.delete(workspace_role.user.id, environment.id)
updated = True
else:
env_role = EnvironmentRoles.get(
workspace_role.user.id, id_and_role["id"]
)
if env_role:
if env_role and env_role.role != new_role:
env_role.role = new_role
else:
updated = True
db.session.add(env_role)
elif not env_role:
env_role = EnvironmentRole(
user=workspace_role.user, environment=environment, role=new_role
)
db.session.add(env_role)
updated = True
db.session.add(env_role)
db.session.commit()
return updated
@classmethod
def revoke_access(cls, user, environment, target_user):

View File

@@ -158,9 +158,12 @@ def update_member(workspace_id, member_id):
updated_role=new_role_name,
)
Environments.update_environment_roles(
updated_roles = Environments.update_environment_roles(
g.current_user, workspace, member, ids_and_roles
)
if updated_roles:
flash("environment_access_changed")
return redirect(
url_for("workspaces.workspace_members", workspace_id=workspace.id)
)

View File

@@ -96,6 +96,11 @@ MESSAGES = {
""",
"category": "warning",
},
"environment_access_changed": {
"title_template": "User access successfully changed.",
"message_template": "",
"category": "success",
},
}