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

Jump to bottom

Update UserMenu.cshtml #100

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Update UserMenu.cshtml #100

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d17110d
Update UserMenu.cshtml
MikeAlhayek Aug 1, 2023
f176e11
Merge branch 'OrchardCoreContrib:main' into patch-1
MikeAlhayek Oct 17, 2023
69ea883
Merge branch 'OrchardCoreContrib:main' into patch-1
MikeAlhayek Oct 18, 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
8 changes: 4 additions & 4 deletions src/OrchardCoreContrib.Gravatar/Views/UserMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li><h6 class="dropdown-header">@T["Signed in as"]<span class="ms-1 font-weight-bold">@User.Identity.Name</span></h6></li>
<li><hr class="dropdown-divider" /></li>
@*
TODO: Use CommonPermissions.EditOwnUser once 1.6.0 is released
*@
@if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.ManageUsers))
@if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.EditOwnUser))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build failed, we need to upgrade to 1.6.0, I will update in another PR then I will merge this

{
<li><a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Edit" asp-controller="Admin" asp-route-returnUrl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a></li>
}
Expand All @@ -32,6 +29,9 @@
<li><a class="dropdown-item" asp-area="OrchardCore.Users" asp-action="Display" asp-controller="Admin" asp-route-id="@userId" asp-route-returnUrl="@FullRequestPath"><span><i class="far fa-address-card" aria-hidden="true"></i></span>&nbsp;<span> @T["Profile"]</span></a></li>
}
<li><a class="dropdown-item" asp-area="OrchardCore.Users" asp-controller="Account" asp-action="ChangePassword" asp-route-returnUrl="@FullRequestPath"><span><i class="fas fa-key" aria-hidden="true"></i></span>&nbsp;<span> @T["Change password"]</span></a></li>

@await RenderSectionAsync("UserMenuItems", required: false)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's something new we added to allow others to inject items in this menu. We should at some point submit a PR to remove most of these menu items from the view and use filters to inject them into the view

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to hear that, I will have a look and merge your PR ASAP

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeAlhayek I presume this should be in the Users module, right? after that we can inject the menu items from other modules

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should only be in UserMenu view which will optionally allow others to inject into this zone


<li><button type="submit" class="dropdown-item"><span><i class="fa fa-sign-out-alt" aria-hidden="true"></i></span>&nbsp;<span> @T["Log off"]</span></button></li>
</ul>
</form>
Expand Down
Loading