lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Extracted Updater for reuse.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-07-15 17:03:07 +01:00
parent c4985ff708
commit 7a7a9b1943
4 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
View File

@@ -26,6 +26,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

25
src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
View File

@@ -9,6 +9,7 @@ using Orchard.ContentTypes.Events;
using Orchard.ContentTypes.ViewModels;
using Orchard.Core.Contents.Extensions;
using Orchard.Localization;
using Orchard.Mvc;
using Orchard.Utility.Extensions;
namespace Orchard.ContentTypes.Services {
@@ -107,7 +108,7 @@ namespace Orchard.ContentTypes.Services {
var partViewModel = part;
// enable updater to be aware of changing part prefix
updater._prefix = secondHalf => String.Format("{0}.{1}", partViewModel.Prefix, secondHalf);
updater.Prefix = secondHalf => String.Format("{0}.{1}", partViewModel.Prefix, secondHalf);
// allow extensions to alter typePart configuration
typeBuilder.WithPart(partViewModel.PartDefinition.Name, typePartBuilder => {
@@ -125,7 +126,7 @@ namespace Orchard.ContentTypes.Services {
var fieldViewModel = field;
// enable updater to be aware of changing field prefix
updater._prefix = secondHalf =>
updater.Prefix = secondHalf =>
String.Format("{0}.{1}.{2}", fieldFirstHalf, fieldViewModel.Prefix, secondHalf);
// allow extensions to alter partField configuration
partBuilder.WithField(fieldViewModel.Name, partFieldBuilder => {
@@ -143,7 +144,7 @@ namespace Orchard.ContentTypes.Services {
var fieldViewModel = field;
// enable updater to be aware of changing field prefix
updater._prefix = secondHalf =>
updater.Prefix = secondHalf =>
string.Format("{0}.{1}", fieldViewModel.Prefix, secondHalf);
// allow extensions to alter partField configuration
@@ -370,23 +371,5 @@ namespace Orchard.ContentTypes.Services {
return string.Format("{0}-{1}", name, version);
}
class Updater : IUpdateModel {
private readonly IUpdateModel _thunk;
public Updater(IUpdateModel thunk) {
_thunk = thunk;
}
public Func<string, string> _prefix = x => x;
public bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {
return _thunk.TryUpdateModel(model, _prefix(prefix), includeProperties, excludeProperties);
}
public void AddModelError(string key, LocalizedString errorMessage) {
_thunk.AddModelError(_prefix(key), errorMessage);
}
}
}
}

28
src/Orchard/Mvc/Updater.cs Normal file
View File

@@ -0,0 +1,28 @@
using System;
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.Mvc {
public class Updater : IUpdateModel {
private readonly IUpdateModel _thunk;
public Updater(IUpdateModel thunk) : this(thunk, x => x) {
}
public Updater(IUpdateModel thunk, Func<string, string> prefix) {
_thunk = thunk;
Prefix = prefix;
}
public Func<string, string> Prefix { get; set; }
public bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {
return _thunk.TryUpdateModel(model, Prefix(prefix), includeProperties, excludeProperties);
}
public void AddModelError(string key, LocalizedString errorMessage) {
_thunk.AddModelError(Prefix(key), errorMessage);
}
}
}

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -150,6 +150,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Environment\Extensions\Helpers\ExtensionManagerExtensions.cs" />
<Compile Include="Mvc\Updater.cs" />
<Compile Include="Recipes\Models\RecipeResult.cs" />
<Compile Include="Recipes\Models\RecipeStepResult.cs" />
<Compile Include="Recipes\Models\BuildContext.cs" />