pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #339 from dod-ccpo/hook-up-add-env-access-link

Browse Source 
Hook up the "Add Environment Access" link when adding a member
This commit is contained in:
patricksmithdds 2018-09-26 09:38:21 -04:00 committed by GitHub
commit 4de0338978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
atst/routes/workspaces.py
View File

@ -89,7 +89,14 @@ def show_workspace(workspace_id):
@bp.route("/workspaces/<workspace_id>/members") @bp.route("/workspaces/<workspace_id>/members")
def workspace_members(workspace_id): def workspace_members(workspace_id):
workspace = Workspaces.get_with_members(g.current_user, workspace_id) workspace = Workspaces.get_with_members(g.current_user, workspace_id)
return render_template("workspaces/members/index.html", workspace=workspace) new_member_name = http_request.args.get("newMemberName")
new_member = next(
filter(lambda m: m.user_name == new_member_name, workspace.members), None
)
return render_template(
"workspaces/members/index.html", workspace=workspace, new_member=new_member
)
@bp.route("/workspaces/<workspace_id>/reports") @bp.route("/workspaces/<workspace_id>/reports")

7
templates/workspaces/members/index.html
View File

@ -20,11 +20,10 @@
{% else %} {% else %}
{% set new_member_name = request.args.get("newMemberName") %} {% if new_member %}
{% if new_member_name %}
{% set message -%} {% set message -%}
<p>{{ new_member_name }} was successfully invited via email to this workspace. They do not yet have access to any environments.</p> <p>{{ new_member.user_name }} was successfully invited via email to this workspace. They do not yet have access to any environments.</p>
<p><a href="#">Add environment access.</a></p> <p><a href="{{ url_for('workspaces.update_member', workspace_id=workspace.id, member_id=new_member.user_id) }}">Add environment access.</a></p>
{%- endset %} {%- endset %}
{{ Alert('Member added successfully', {{ Alert('Member added successfully',