diff --git a/atst/forms/data.py b/atst/forms/data.py index 959dec96..21427660 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -187,17 +187,18 @@ ENVIRONMENT_ROLES = [ ] ENVIRONMENT_ROLES = [ + (None, {"name": "No access", "description": "No environment access."}), ( - "developer", + "meow", { - "name": "Developer", + "name": "Meow", "description": "Configures cloud-based IaaS and PaaS computing, networking, and storage services.", }, ), ( - "owner", + "woof", { - "name": "Workspace Owner", + "name": "Woof", "description": "Can add, edit, deactivate access to all projects, environments, and members. Can view budget reports. Can start and edit JEDI Cloud requests.", }, ), diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 23e05740..0dca879b 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -214,7 +214,7 @@ def view_member(workspace_id, member_id): "edit this workspace user", ) member = WorkspaceUsers.get(workspace_id, member_id) - form = EditMemberForm(workspace_role=member.role) + form = EditMemberForm(workspace_role=member.role, environment_role="") return render_template( "workspaces/members/edit.html", form=form, workspace=workspace, member=member ) diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html index 24489e6f..2afcf936 100644 --- a/templates/workspaces/members/edit.html +++ b/templates/workspaces/members/edit.html @@ -3,223 +3,185 @@ {% from "components/icon.html" import Icon %} {% from "components/modal.html" import Modal %} {% from "components/selector.html" import Selector %} +{% from "components/options_input.html" import OptionsInput %} {% block content %} -