yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update AutoMapper to v6

Browse Source
This commit is contained in:
Stephan
2017-07-19 13:42:47 +02:00
parent 6098ba42a2
commit 2a9072609d
59 changed files with 2147 additions and 1964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
View File

@@ -4,10 +4,8 @@ using System.Linq;
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Services;
using Umbraco.Web.Models.ContentEditing;
using umbraco;
using Umbraco.Web.Composing;
namespace Umbraco.Web.Models.Mapping
@@ -15,7 +13,7 @@ namespace Umbraco.Web.Models.Mapping
/// <summary>
/// Creates the tabs collection with properties assigned for display models
/// </summary>
internal class TabsAndPropertiesResolver : ValueResolver<IContentBase, IEnumerable<Tab<ContentPropertyDisplay>>>
internal class TabsAndPropertiesResolver
{
private readonly ILocalizedTextService _localizedTextService;
protected IEnumerable<string> IgnoreProperties { get; set; }
@@ -219,7 +217,7 @@ namespace Umbraco.Web.Models.Mapping
display.Tabs = tabs;
}
protected override IEnumerable<Tab<ContentPropertyDisplay>> ResolveCore(IContentBase content)
public virtual IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IContentBase content)
{
var tabs = new List<Tab<ContentPropertyDisplay>>();