mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-25 20:18:38 +02:00
fix Clicking cancel on Member Access and Permissions page navigates back to the wrong user
This commit is contained in:
parent
7e4a99fd33
commit
0c154e537e
2 changed files with 13 additions and 12 deletions
|
@ -18,24 +18,24 @@
|
||||||
{% endblock messages%}
|
{% endblock messages%}
|
||||||
|
|
||||||
<!-- Navigation breadcrumbs -->
|
<!-- Navigation breadcrumbs -->
|
||||||
<nav class="usa-breadcrumb padding-top-0 bg-gray-1" aria-label="Domain request breadcrumb">
|
{% url 'members' as url %}
|
||||||
<ol class="usa-breadcrumb__list">
|
{% if portfolio_permission %}
|
||||||
|
{% url 'member' pk=portfolio_permission.id as url2 %}
|
||||||
|
{% else %}
|
||||||
|
{% url 'invitedmember' pk=invitation.id as url2 %}
|
||||||
|
{% endif %}
|
||||||
|
<nav class="usa-breadcrumb padding-top-0 bg-gray-1" aria-label="Portfolio member breadcrumb">
|
||||||
|
<ol class="usa-breadcrumb__list">
|
||||||
<li class="usa-breadcrumb__list-item">
|
<li class="usa-breadcrumb__list-item">
|
||||||
<a href="{% url 'members' %}" class="usa-breadcrumb__link"><span>Members</span></a>
|
<a href="{{ url }}" class="usa-breadcrumb__link"><span>Members</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="usa-breadcrumb__list-item">
|
<li class="usa-breadcrumb__list-item">
|
||||||
{% if member %}
|
<a href="{{ url2 }}" class="usa-breadcrumb__link"><span>Manage member</span></a>
|
||||||
{% url 'member' pk=member.id as back_url %}
|
|
||||||
{% elif invitation %}
|
|
||||||
{% url 'invitedmember' pk=invitation.id as back_url %}
|
|
||||||
{% endif %}
|
|
||||||
<a href="{{ back_url }}" class="usa-breadcrumb__link"><span>Manage member</span></a>
|
|
||||||
</li>
|
</li>
|
||||||
{% comment %} Manage members {% endcomment %}
|
|
||||||
<li class="usa-breadcrumb__list-item usa-current" aria-current="page">
|
<li class="usa-breadcrumb__list-item usa-current" aria-current="page">
|
||||||
<span>Member access and permissions</span>
|
<span>Member access and permissions</span>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<!-- Page header -->
|
<!-- Page header -->
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
<div class="margin-top-3">
|
<div class="margin-top-3">
|
||||||
<a
|
<a
|
||||||
type="button"
|
type="button"
|
||||||
href="{{ back_url }}"
|
href="{{ url2 }}"
|
||||||
class="usa-button usa-button--outline"
|
class="usa-button usa-button--outline"
|
||||||
name="btn-cancel-click"
|
name="btn-cancel-click"
|
||||||
aria-label="Cancel editing member"
|
aria-label="Cancel editing member"
|
||||||
|
|
|
@ -202,6 +202,7 @@ class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
|
||||||
{
|
{
|
||||||
"form": form,
|
"form": form,
|
||||||
"member": user,
|
"member": user,
|
||||||
|
"portfolio_permission": portfolio_permission,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue