Let input value be simple
This commit is contained in:
parent
32d04bfce4
commit
bead1990c9
@ -54,13 +54,13 @@ class Environments(object):
|
|||||||
return env
|
return env
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def update_environment_role(cls, environment_data, workspace_user):
|
def update_environment_role(cls, ids_and_roles, workspace_user):
|
||||||
# TODO need to check permissions?
|
# TODO need to check permissions?
|
||||||
for i in range(len(environment_data)):
|
for i in range(len(ids_and_roles)):
|
||||||
new_role = environment_data[i]["role"]
|
new_role = ids_and_roles[i]["role"]
|
||||||
environment = Environments.get(environment_data[i]["id"])
|
environment = Environments.get(ids_and_roles[i]["id"])
|
||||||
env_role = EnvironmentRole.get(
|
env_role = EnvironmentRole.get(
|
||||||
workspace_user.user_id, environment_data[i]["id"]
|
workspace_user.user_id, ids_and_roles[i]["id"]
|
||||||
)
|
)
|
||||||
if env_role:
|
if env_role:
|
||||||
env_role.role = new_role
|
env_role.role = new_role
|
||||||
|
@ -187,13 +187,7 @@ ENVIRONMENT_ROLES = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
ENVIRONMENT_ROLES = [
|
ENVIRONMENT_ROLES = [
|
||||||
(
|
("no_access", {"name": "no access", "description": "No environment access."}),
|
||||||
"no_access",
|
|
||||||
{
|
|
||||||
"name": "no access",
|
|
||||||
"description": "No environment access."
|
|
||||||
}
|
|
||||||
),
|
|
||||||
(
|
(
|
||||||
"database_admin",
|
"database_admin",
|
||||||
{
|
{
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import re, ast
|
import re
|
||||||
from datetime import date, timedelta
|
from datetime import date, timedelta
|
||||||
|
|
||||||
from flask import (
|
from flask import (
|
||||||
@ -241,11 +241,13 @@ def update_member(workspace_id, member_id):
|
|||||||
)
|
)
|
||||||
member = WorkspaceUsers.get(workspace_id, member_id)
|
member = WorkspaceUsers.get(workspace_id, member_id)
|
||||||
|
|
||||||
environment_data = []
|
ids_and_roles = []
|
||||||
form_dict = http_request.form.to_dict()
|
form_dict = http_request.form.to_dict()
|
||||||
for entry in form_dict:
|
for entry in form_dict:
|
||||||
if re.match("env_", entry):
|
if re.match("env_", entry):
|
||||||
environment_data.append(ast.literal_eval(form_dict[entry]))
|
env_id = entry[4:]
|
||||||
|
env_role = form_dict[entry]
|
||||||
|
ids_and_roles.append({"id": env_id, "role": env_role})
|
||||||
|
|
||||||
form = EditMemberForm(http_request.form)
|
form = EditMemberForm(http_request.form)
|
||||||
|
|
||||||
@ -257,7 +259,7 @@ def update_member(workspace_id, member_id):
|
|||||||
)
|
)
|
||||||
new_role_name = member.role_displayname
|
new_role_name = member.role_displayname
|
||||||
|
|
||||||
Environments.update_environment_role(environment_data, member)
|
Environments.update_environment_role(ids_and_roles, member)
|
||||||
|
|
||||||
return redirect(
|
return redirect(
|
||||||
url_for(
|
url_for(
|
||||||
|
@ -91,11 +91,11 @@
|
|||||||
|
|
||||||
{% if choice[0] != "" %}
|
{% if choice[0] != "" %}
|
||||||
<input
|
<input
|
||||||
name='env_{{ env.name }}_{{ project.id }}'
|
name='env_{{ env.id }}'
|
||||||
v-on:change="change"
|
v-on:change='change'
|
||||||
type='radio'
|
type='radio'
|
||||||
id="env_{{ env.id }}_{{ choice[0] }}"
|
id="env_{{ env.id }}_{{ choice[0] }}"
|
||||||
value='{ "id": "{{ env.id }}", "role": "{{ choice[0] }}" }'
|
value='{{ choice[0] }}'
|
||||||
{% if role == choice[0] %}
|
{% if role == choice[0] %}
|
||||||
checked='checked'
|
checked='checked'
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user