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

Merge branch 'temp8' into temp-editing-all-variants

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
#	src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
This commit is contained in:
Shannon
2018-07-19 19:30:38 +10:00
parent 309e0e6dc8 1f1bb37a57
commit 888f8cfc56
58 changed files with 2640 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
View File

@@ -16,25 +16,24 @@ namespace Umbraco.Web.Models.Mapping
internal class ContentMapperProfile : Profile
{
public ContentMapperProfile(
ContentUrlResolver contentUrlResolver,
ContentTreeNodeUrlResolver<IContent, ContentTreeController> contentTreeNodeUrlResolver,
TabsAndPropertiesResolver<IContent, ContentVariantDisplay> tabsAndPropertiesResolver,
IUserService userService,
ILocalizedTextService textService,
IContentService contentService,
IContentTypeService contentTypeService,
IDataTypeService dataTypeService,
ILocalizationService localizationService,
PropertyEditorCollection propertyEditors,
ILogger logger)
{
// create, capture, cache
var contentOwnerResolver = new OwnerResolver<IContent>(userService);
var creatorResolver = new CreatorResolver(userService);
var actionButtonsResolver = new ActionButtonsResolver(userService, contentService);
var tabsAndPropertiesResolver = new TabsAndPropertiesResolver<IContent, ContentVariantDisplay>(textService);
var childOfListViewResolver = new ContentChildOfListViewResolver(contentService, contentTypeService);
var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>();
var contentTreeNodeUrlResolver = new ContentTreeNodeUrlResolver<IContent, ContentTreeController>();
var defaultTemplateResolver = new DefaultTemplateResolver();
var contentUrlResolver = new ContentUrlResolver(textService, contentService, logger);
var variantResolver = new ContentVariantResolver(localizationService, textService);
var contentAppResolver = new ContentAppResolver(dataTypeService, propertyEditors);