Skip to content

Commit db85842

Browse files
gvkriesgvkries
authored
Merge branch 'main' into gvkries/gql-4603
2 parents aa669dd + 049d775 commit db85842

File tree

166 files changed

+2631
-775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+2631
-775
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,6 +3295,15 @@
32953295
"contributions": [
32963296
"code"
32973297
]
3298+
},
3299+
{
3300+
"login": "davidlfox",
3301+
"name": "David L. Fox",
3302+
"avatar_url": "https://avatars.githubusercontent.com/u/5315855?v=4",
3303+
"profile": "https://www.iamdavidfox.com",
3304+
"contributions": [
3305+
"code"
3306+
]
32983307
}
32993308
],
33003309
"skipCi": true,

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageVersion Include="AngleSharp" Version="1.2.0" />
10-
<PackageVersion Include="AWSSDK.S3" Version="3.7.411.5" />
10+
<PackageVersion Include="AWSSDK.S3" Version="3.7.412.4" />
1111
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
1212
<PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
1313
<PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />

‎mkdocs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ nav:
265265
- Mini Profiler: reference/modules/MiniProfiler/README.md
266266
- Modules: reference/modules/Modules/README.md
267267
- OpenId: reference/modules/OpenId/README.md
268+
- Permissions: reference/modules/Security/Permissions.md
268269
- Razor Helpers: reference/modules/Razor/README.md
269270
- Recipes: reference/modules/Recipes/README.md
270271
- Redis: reference/modules/Redis/README.md

‎src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,34 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
2222

2323
protected override ValueTask BuildAsync(NavigationBuilder builder)
2424
{
25-
builder
25+
if (NavigationHelper.UseLegacyFormat())
26+
{
27+
builder
2628
.Add(S["Configuration"], configuration => configuration
2729
.Add(S["Settings"], settings => settings
2830
.Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
29-
.AddClass("admin").Id("admin")
31+
.AddClass("admin")
32+
.Id("admin")
3033
.Action("Index", "Admin", _routeValues)
3134
.Permission(PermissionsAdminSettings.ManageAdminSettings)
3235
.LocalNav()
3336
)
3437
)
3538
);
3639

40+
return ValueTask.CompletedTask;
41+
}
42+
43+
builder
44+
.Add(S["Settings"], settings => settings
45+
.Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
46+
.AddClass("admin").Id("admin")
47+
.Action("Index", "Admin", _routeValues)
48+
.Permission(PermissionsAdminSettings.ManageAdminSettings)
49+
.LocalNav()
50+
)
51+
);
52+
3753
return ValueTask.CompletedTask;
3854
}
3955
}

‎src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
<span class="icon">
2-
<i class="fa-solid fa-tachometer" aria-hidden="true"></i>
1+
@using OrchardCore.Navigation
2+
3+
@if (NavigationHelper.UseLegacyFormat())
4+
{
5+
<span class="icon">
6+
<i class="fa-solid fa-tachometer" aria-hidden="true"></i>
7+
</span>
8+
<span class="title">@Model.Text</span>
9+
10+
return;
11+
}
12+
13+
<span class="icon icon-none">
314
</span>
4-
<span class="title">@T["Admin"]</span>
15+
<span class="title">@Model.Text</span>

‎src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<span class="icon"><i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i></span><span class="title">@T["Dashboard"]</span>
1+
<span class="icon">
2+
<i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i>
3+
</span>
4+
<span class="title">@Model.Text</span>

‎src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,30 @@ public AdminMenu(
2020

2121
protected override ValueTask BuildAsync(NavigationBuilder builder)
2222
{
23-
// Configuration and settings menus for the AdminMenu module.
24-
builder
25-
.Add(S["Configuration"], configuration => configuration
26-
.Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
27-
.Permission(Permissions.ManageAdminMenu)
28-
.Action("List", "Menu", "OrchardCore.AdminMenu")
29-
.LocalNav()
30-
)
31-
);
23+
if (NavigationHelper.UseLegacyFormat())
24+
{
25+
// Configuration and settings menus for the AdminMenu module.
26+
builder
27+
.Add(S["Configuration"], configuration => configuration
28+
.Add(S["Admin menus"], S["Admin menus"].PrefixPosition(), adminMenu => adminMenu
29+
.Permission(Permissions.ManageAdminMenu)
30+
.Action("List", "Menu", "OrchardCore.AdminMenu")
31+
.LocalNav()
32+
)
33+
);
34+
}
35+
else
36+
{
37+
// Configuration and settings menus for the AdminMenu module.
38+
builder
39+
.Add(S["Tools"], tools => tools
40+
.Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
41+
.Permission(Permissions.ManageAdminMenu)
42+
.Action("List", "Menu", "OrchardCore.AdminMenu")
43+
.LocalNav()
44+
)
45+
);
46+
}
3247

3348
// This is the entry point for the adminMenu: dynamically generated custom admin menus.
3449
return _adminMenuNavigationProviderCoordinator.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder);

‎src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,22 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
1414

1515
protected override ValueTask BuildAsync(NavigationBuilder builder)
1616
{
17+
if (NavigationHelper.UseLegacyFormat())
18+
{
19+
builder
20+
.Add(S["Configuration"], configuration => configuration
21+
.Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL
22+
.Action("Index", "Admin", "OrchardCore.Apis.GraphQL")
23+
.Permission(CommonPermissions.ExecuteGraphQL)
24+
.LocalNav()
25+
)
26+
);
27+
28+
return ValueTask.CompletedTask;
29+
}
30+
1731
builder
18-
.Add(S["Configuration"], configuration => configuration
32+
.Add(S["Tools"], tools => tools
1933
.Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL
2034
.Action("Index", "Admin", "OrchardCore.Apis.GraphQL")
2135
.Permission(CommonPermissions.ExecuteGraphQL)

‎src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs‎

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Routing;
22
using Microsoft.Extensions.Localization;
33
using OrchardCore.AuditTrail.Controllers;
4+
using OrchardCore.AuditTrail.Settings;
45
using OrchardCore.Navigation;
56

67
namespace OrchardCore.AuditTrail.Navigation;
@@ -13,6 +14,12 @@ public sealed class AuditTrailAdminMenu : AdminNavigationProvider
1314
{ "correlationId", string.Empty },
1415
};
1516

17+
private static readonly RouteValueDictionary _settingsRouteValues = new()
18+
{
19+
{ "area", "OrchardCore.Settings" },
20+
{ "groupId", AuditTrailSettingsGroup.Id },
21+
};
22+
1623
internal readonly IStringLocalizer S;
1724

1825
public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
@@ -22,13 +29,49 @@ public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer
2229

2330
protected override ValueTask BuildAsync(NavigationBuilder builder)
2431
{
32+
if (NavigationHelper.UseLegacyFormat())
33+
{
34+
builder
35+
.Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
36+
.AddClass("audittrail")
37+
.Id("audittrail")
38+
.Action(nameof(AdminController.Index), "Admin", _routeValues)
39+
.Permission(AuditTrailPermissions.ViewAuditTrail)
40+
.LocalNav()
41+
, priority: 1)
42+
.Add(S["Configuration"], configuration => configuration
43+
.Add(S["Settings"], settings => settings
44+
.Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail
45+
.AddClass("audittrail")
46+
.Id("audittrailSettings")
47+
.Action("Index", "Admin", _routeValues)
48+
.Permission(AuditTrailPermissions.ManageAuditTrailSettings)
49+
.LocalNav()
50+
)
51+
)
52+
);
53+
54+
return ValueTask.CompletedTask;
55+
}
56+
2557
builder
26-
.Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
27-
.AddClass("audittrail")
28-
.Id("audittrail")
29-
.Action(nameof(AdminController.Index), "Admin", _routeValues)
30-
.Permission(AuditTrailPermissions.ViewAuditTrail)
31-
.LocalNav()
58+
.Add(S["Tools"], tools => tools
59+
.Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), configuration => configuration
60+
.AddClass("audittrail")
61+
.Id("audittrail")
62+
.Action(nameof(AdminController.Index), "Admin", _routeValues)
63+
.Permission(AuditTrailPermissions.ViewAuditTrail)
64+
.LocalNav()
65+
)
66+
)
67+
.Add(S["Settings"], settings => settings
68+
.Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail
69+
.AddClass("audittrail")
70+
.Id("audittrailSettings")
71+
.Action("Index", "Admin", _settingsRouteValues)
72+
.Permission(AuditTrailPermissions.ManageAuditTrailSettings)
73+
.LocalNav()
74+
)
3275
);
3376

3477
return ValueTask.CompletedTask;

‎src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)