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

Merge pull request #409 from dod-ccpo/remove-edit-acct-link-#161022031

Browse Source 
Add conditional logic to show Edit Account link
This commit is contained in:
leigh-mil 2018-10-29 10:48:55 -04:00 committed by GitHub
commit 4d18656164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/workspaces.py
View File

@ -255,6 +255,7 @@ def view_member(workspace_id, member_id):
member = WorkspaceUsers.get(workspace_id, member_id) member = WorkspaceUsers.get(workspace_id, member_id)
projects = Projects.get_all(g.current_user, member, workspace) projects = Projects.get_all(g.current_user, member, workspace)
form = EditMemberForm(workspace_role=member.role) form = EditMemberForm(workspace_role=member.role)
editable = g.current_user == member.user
return render_template( return render_template(
"workspaces/members/edit.html", "workspaces/members/edit.html",
workspace=workspace, workspace=workspace,
@ -264,6 +265,7 @@ def view_member(workspace_id, member_id):
choices=ENVIRONMENT_ROLES, choices=ENVIRONMENT_ROLES,
env_role_modal_description=ENV_ROLE_MODAL_DESCRIPTION, env_role_modal_description=ENV_ROLE_MODAL_DESCRIPTION,
EnvironmentRoles=EnvironmentRoles, EnvironmentRoles=EnvironmentRoles,
editable=editable,
) )

4
templates/workspaces/members/edit.html
View File

@ -30,7 +30,9 @@
<dd>{{ member.user.email }}</dd> <dd>{{ member.user.email }}</dd>
</div> </div>
</dl> </dl>
<a href='#' class='icon-link'>edit account details</a> {% if editable %}
<a href='{{ url_for("users.user") }}' class='icon-link'>edit account details</a>
{% endif %}
</div> </div>
</div> </div>