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

OCC-245: Update OC preview version #170

Merged
merged 33 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version #170

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1cf44a1
Update OC preview version.
sarahelsaig May 28, 2024
424fc91
Update OC preview version.
sarahelsaig May 30, 2024
916e0c3
Update OC preview version.
sarahelsaig Jun 5, 2024
c75c35d
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
a5e5afc
Update OC version.
sarahelsaig Jun 18, 2024
198a812
Update OC version.
sarahelsaig Jun 19, 2024
eaf409b
Update OC preview version.
sarahelsaig Jun 20, 2024
bb92529
Update OC preview version.
sarahelsaig Jun 21, 2024
7373769
Merge remote-tracking branch 'origin/issue/OCC-245' into issue/OCC-245
sarahelsaig Jun 21, 2024
d863a02
Update HL and UITT NuGet versions.
sarahelsaig Jun 24, 2024
197fd92
Update OC NuGet versions.
sarahelsaig Jun 24, 2024
fbcd47a
Update to latest OC preview version.
sarahelsaig Jul 2, 2024
2cb7148
Update OC preview version.
sarahelsaig Jul 11, 2024
5c5d168
Merge remote-tracking branch 'origin/dev' into issue/OCC-245
sarahelsaig Jul 11, 2024
01ddf7f
Fix package consolidation.
sarahelsaig Jul 11, 2024
2c05143
Merge remote-tracking branch 'origin/task/system-text-json-migration'…
sarahelsaig Jul 12, 2024
a9d0e60
Update HL version.
sarahelsaig Jul 13, 2024
38eb4a0
Update UITT version.
sarahelsaig Jul 13, 2024
af7f503
Use CreateModelMaybeAsync.
sarahelsaig Jul 14, 2024
92b464b
Update HL nuget version.
sarahelsaig Jul 16, 2024
b26c98c
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
5610a0f
Update package version.
sarahelsaig Jul 16, 2024
5fe7a1f
Update OC preview versions.
sarahelsaig Jul 24, 2024
c382b33
Fix param.
sarahelsaig Jul 24, 2024
7de2d89
Update HL preview version.
sarahelsaig Jul 26, 2024
f19fc1f
Update UITT preview version.
sarahelsaig Jul 26, 2024
6e13d74
Update HL preview.
sarahelsaig Jul 27, 2024
ab0a7dc
Update UITT version.
sarahelsaig Jul 27, 2024
2d125a1
Update UITT preview version.
sarahelsaig Jul 27, 2024
b1fe33d
NuGet.config
sarahelsaig Jul 27, 2024
8dd7409
Update HL nuget version.
sarahelsaig Jul 27, 2024
00e2953
Update HL.
sarahelsaig Jul 27, 2024
60efcf6
OrchardCore.Email.Smtp instead of OrchardCore.Email.
sarahelsaig Jul 28, 2024
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
2 changes: 1 addition & 1 deletion Lombiq.HelpfulExtensions.Tests.UI/Lombiq.HelpfulExtensions.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

</Project>
12 changes: 5 additions & 7 deletions Lombiq.HelpfulExtensions/Extensions/Security/Driver/StrictSecuritySettingsDisplayDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using OrchardCore.ContentManagement.Metadata.Models;
using OrchardCore.ContentManagement.Metadata.Settings;
using OrchardCore.ContentTypes.Editors;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.Views;
using System.Threading.Tasks;

Expand All @@ -20,15 +21,12 @@ public override IDisplayResult Edit(ContentTypeDefinition model) =>

public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition model, UpdateTypeEditorContext context)
{
var viewModel = new StrictSecuritySettingsViewModel();
var viewModel = await context.CreateModelMaybeAsync<StrictSecuritySettingsViewModel>(Prefix);

if (await context.Updater.TryUpdateModelAsync(viewModel, Prefix))
{
// Securable must be enabled for Strict Securable to make sense. Also checked on the client side too.
if (model.GetSettings<ContentTypeSettings>()?.Securable != true) viewModel.Enabled = false;
// Securable must be enabled for Strict Securable to make sense. Also checked on the client side too.
if (model.GetSettings<ContentTypeSettings>()?.Securable != true) viewModel.Enabled = false;

context.Builder.MergeSettings<StrictSecuritySettings>(settings => settings.Enabled = viewModel.Enabled);
}
context.Builder.MergeSettings<StrictSecuritySettings>(settings => settings.Enabled = viewModel.Enabled);

return Edit(model);
}
Expand Down
26 changes: 13 additions & 13 deletions Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Autoroute" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Contents" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Flows" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Html" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Lists" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Liquid.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Markdown" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Rules.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Workflows" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Autoroute" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Contents" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Flows" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Html" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Lists" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Liquid.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Markdown" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.MetaWeblog.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Rules.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Workflows" Version="2.0.0-preview-18282" />
<PackageReference Include="Scrutor" Version="4.2.2" />
</ItemGroup>

Expand All @@ -56,7 +56,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions Lombiq.HelpfulExtensions/Views/ContentSetPart.MemberLink.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<li>
@if (!string.IsNullOrEmpty(link.ContentItemId))
{
var url = Orchard.Action<AdminController>(controller => controller.Edit(
link.ContentItemId));
var url = Orchard.Action<AdminController>(controller => controller.Edit(link.ContentItemId, null));
<a class="dropdown-item btn-sm" href="@url" title="@T["Edit {0}", link.DisplayText]">
<i class="fa-solid fa-edit" aria-hidden="true"></i> @link.DisplayText
</a>
Expand Down