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

Migrate to OrchardCore 2.0 #130

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate to OrchardCore 2.0 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ecab2
Migrate to OrchardCore 2.0
asimeonov Sep 25, 2024
2621172
Update to latest OC version
asimeonov Dec 30, 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
6 changes: 3 additions & 3 deletions Code/Drivers/CodeFieldDisplayDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Etch.OrchardCore.Fields.Code.Fields;
using Etch.OrchardCore.Fields.Code.Fields;
using Etch.OrchardCore.Fields.Code.ViewModels;
using OrchardCore.ContentManagement.Display.ContentDisplay;
using OrchardCore.ContentManagement.Display.Models;
Expand Down Expand Up @@ -41,11 +41,11 @@ public override IDisplayResult Edit(CodeField field, BuildFieldEditorContext con
});
}

public override async Task<IDisplayResult> UpdateAsync(CodeField field, IUpdateModel updater, UpdateFieldEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(CodeField field, UpdateFieldEditorContext context)
{
var model = new EditCodeFieldViewModel();

if (await updater.TryUpdateModelAsync(model, Prefix, m => m.Value))
if (await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Value))
{
field.Value = model.Value;
}
Expand Down
9 changes: 5 additions & 4 deletions Code/Settings/CodeFieldSettingsDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Etch.OrchardCore.Fields.Code.Fields;
using System.Threading.Tasks;
using Etch.OrchardCore.Fields.Code.Fields;
using Etch.OrchardCore.Fields.Code.ViewModels;
using OrchardCore.ContentManagement.Metadata.Models;
using OrchardCore.ContentTypes.Editors;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.Views;
using System.Threading.Tasks;

namespace Etch.OrchardCore.Fields.Code.Settings
{
Expand All @@ -13,7 +14,7 @@ public class CodeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<C

#region Edit

public override IDisplayResult Edit(ContentPartFieldDefinition model)
public override IDisplayResult Edit(ContentPartFieldDefinition model, BuildEditorContext context)
{
return Initialize<EditCodeFieldSettingsViewModel>("CodeFieldSettings_Edit", viewModel =>
{
Expand All @@ -39,7 +40,7 @@ public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinitio
});
}

return Edit(model);
return Edit(model, context);
}

#endregion
Expand Down
13 changes: 4 additions & 9 deletions Colour/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Localization;
using OrchardCore.Navigation;
using System;
using System.Threading.Tasks;

namespace Etch.OrchardCore.Fields.Colour
{
public class AdminMenu : INavigationProvider
public class AdminMenu : AdminNavigationProvider
{
public IStringLocalizer S { get; set; }

Expand All @@ -14,13 +14,8 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)
S = localizer;
}

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
protected override ValueTask BuildAsync(NavigationBuilder builder)
{
if (!string.Equals(name, "admin", StringComparison.OrdinalIgnoreCase))
{
return Task.CompletedTask;
}

builder
.Add(S["Configuration"], configuration => configuration
.Add(S["Settings"], settings => settings
Expand All @@ -31,7 +26,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
.LocalNav()
)));

return Task.CompletedTask;
return ValueTask.CompletedTask;
}
}
}
11 changes: 5 additions & 6 deletions Colour/Drivers/ColourFieldDisplayDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using Etch.OrchardCore.Fields.Code.ViewModels;
using System.Threading.Tasks;
using Etch.OrchardCore.Fields.Code.ViewModels;
using Etch.OrchardCore.Fields.Colour.Fields;
using Etch.OrchardCore.Fields.Colour.Settings;
using Etch.OrchardCore.Fields.Colour.ViewModels;
using OrchardCore.ContentManagement.Display.ContentDisplay;
using OrchardCore.ContentManagement.Display.Models;
using OrchardCore.DisplayManagement.ModelBinding;
using OrchardCore.DisplayManagement.Views;
using System.Threading.Tasks;

namespace Etch.OrchardCore.Fields.Colour.Drivers
{
Expand All @@ -29,11 +28,11 @@ public override IDisplayResult Edit(ColourField field, BuildFieldEditorContext c
});
}

public override async Task<IDisplayResult> UpdateAsync(ColourField field, IUpdateModel updater, UpdateFieldEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ColourField field, UpdateFieldEditorContext context)
{
var model = new EditCodeFieldViewModel();

if (await updater.TryUpdateModelAsync(model, Prefix, m => m.Value))
if (await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Value))
{
field.Value = model.Value;
}
Expand All @@ -45,4 +44,4 @@ public override async Task<IDisplayResult> UpdateAsync(ColourField field, IUpdat

#endregion Implementation
}
}
}
28 changes: 12 additions & 16 deletions Colour/Drivers/ColourSettingsDisplayDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Etch.OrchardCore.Fields.Colour.Settings;
using Etch.OrchardCore.Fields.Colour.Settings;
using Etch.OrchardCore.Fields.Colour.ViewModels;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using OrchardCore.DisplayManagement.Entities;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.Views;
using OrchardCore.Settings;
using System.Text.Json;
using System.Threading.Tasks;

namespace Etch.OrchardCore.Fields.Colour.Drivers
Expand All @@ -32,22 +32,18 @@ public ColourSettingsDisplayDriver(IAuthorizationService authorizationService, I

#region Overrides

public override async Task<IDisplayResult> EditAsync(ColourSettings section, BuildEditorContext context)
public override IDisplayResult Edit(ISite site, ColourSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageColourSettings))
{
return null;
}

return Initialize<ColourSettingsViewModel>("ColourSettings_Edit", model =>
{
model.Colours = JsonConvert.SerializeObject(section.Colours);
}).Location("Content:3").OnGroup(Constants.GroupId);
model.Colours = JConvert.SerializeObject(section.Colours);
})
.Location("Content:3")
.OnGroup(Constants.GroupId)
.RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageColourSettings));
}

public override async Task<IDisplayResult> UpdateAsync(ColourSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite site, ColourSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -62,13 +58,13 @@ public override async Task<IDisplayResult> UpdateAsync(ColourSettings section, B

if (await context.Updater.TryUpdateModelAsync(model, Prefix))
{
section.Colours = JsonConvert.DeserializeObject<ColourItem[]>(model.Colours);
section.Colours = JConvert.DeserializeObject<ColourItem[]>(model.Colours);
}
}

return await EditAsync(section, context);
return Edit(site, section, context);
}

#endregion
}
}
}
13 changes: 7 additions & 6 deletions Colour/Settings/ColourFieldSettingsDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Etch.OrchardCore.Fields.Colour.Fields;
using Etch.OrchardCore.Fields.Colour.Fields;
using Etch.OrchardCore.Fields.Colour.ViewModels;
using Newtonsoft.Json;
using OrchardCore.ContentManagement.Metadata.Models;
using OrchardCore.ContentTypes.Editors;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.Views;
using System.Text.Json;
using System.Threading.Tasks;

namespace Etch.OrchardCore.Fields.Colour.Settings
Expand All @@ -14,15 +15,15 @@ public class ColourFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver

#region Edit

public override IDisplayResult Edit(ContentPartFieldDefinition model)
public override IDisplayResult Edit(ContentPartFieldDefinition model, BuildEditorContext context)
{
return Initialize<EditColourFieldSettingsViewModel>("ColourFieldSettings_Edit", viewModel =>
{
var settings = model.GetSettings<ColourFieldSettings>();

viewModel.AllowCustom = settings.AllowCustom;
viewModel.AllowTransparent = settings.AllowTransparent;
viewModel.Colours = JsonConvert.SerializeObject(settings.Colours);
viewModel.Colours = JConvert.SerializeObject(settings.Colours);
viewModel.DefaultValue = settings.DefaultValue;
viewModel.Hint = settings.Hint;
viewModel.UseGlobalColours = settings.UseGlobalColours;
Expand All @@ -40,14 +41,14 @@ public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinitio
{
AllowCustom = viewModel.AllowCustom,
AllowTransparent = viewModel.AllowTransparent,
Colours = JsonConvert.DeserializeObject<ColourItem[]>(viewModel.Colours),
Colours = JConvert.DeserializeObject<ColourItem[]>(viewModel.Colours),
DefaultValue = viewModel.DefaultValue,
Hint = viewModel.Hint,
UseGlobalColours = viewModel.UseGlobalColours
});
}

return Edit(model);
return Edit(model, context);
}

#endregion
Expand Down
Loading
Loading