Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAC-192 - Add account id to params for building return url #718

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −3
Open

MAC-192 - Add account id to params for building return url #718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2deea7
MAC-192 - Add account id to params for building return url
dashton82 Jun 1, 2023
228070e
MAC-192 - add proper link incase anyone does unexpected behaviour
dashton82 Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SFA.DAS.Employer.Shared.UI/SFA.DAS.Employer.Shared.UI/Views/Shared/_Menu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
@if (Context.User.Identity.IsAuthenticated)
{
<li role="menuitem" class="das-user-navigation__list-item das-user-navigation__list-item--has-sub-menu">
<a href="/" role="menuitem" class="das-user-navigation__link">Settings</a>
<a href="@LinkGenerator.AccountsLink("Accounts")" role="menuitem" class="das-user-navigation__link">Settings</a>
<ul role="menu" class="das-user-navigation__sub-menu js-hidden">
<li class="das-user-navigation__sub-menu-list-item" role="menuitem">
<a href="@LinkGenerator.AccountsLink("Accounts")" role="menuitem" class="das-user-navigation__sub-menu-link mu-accounts">Your accounts</a>
Expand All @@ -76,10 +76,10 @@
@if (!string.IsNullOrEmpty(clientId))
{
<li class="das-user-navigation__sub-menu-list-item" role="menuitem">
<a href="@LinkGenerator.UsersLink("ChangePassword", clientId, GetEncodedReturnUrl(LinkGenerator.ActiveSection(selectedSection, "ChangePasswordReturn")))" class="das-user-navigation__sub-menu-link mu-change-pass">Change your password</a>
<a href="@LinkGenerator.UsersLink("ChangePassword", clientId, GetEncodedReturnUrl(LinkGenerator.ActiveSection(selectedSection, "ChangePasswordReturn", accountId)))" class="das-user-navigation__sub-menu-link mu-change-pass">Change your password</a>
</li>
<li class="das-user-navigation__sub-menu-list-item" role="menuitem">
<a href="@LinkGenerator.UsersLink("ChangeEmailAddress", clientId, GetEncodedReturnUrl(LinkGenerator.ActiveSection(selectedSection, "ChangeEmailReturn")))" class="das-user-navigation__sub-menu-link mu-change-email">Change your email address</a>
<a href="@LinkGenerator.UsersLink("ChangeEmailAddress", clientId, GetEncodedReturnUrl(LinkGenerator.ActiveSection(selectedSection, "ChangeEmailReturn", accountId)))" class="das-user-navigation__sub-menu-link mu-change-email">Change your email address</a>
</li>
}
else
Expand Down