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

Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well.

Browse Source
This commit is contained in:
Shannon
2013-07-25 15:31:26 +10:00
parent 7d6736907f
commit 4b8fed9f06
22 changed files with 548 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
View File

@@ -15,59 +15,50 @@ namespace Umbraco.Web.Models.Mapping
{
}
public ContentItemDto<IContent> ToContentItemDto(IContent content)
{
var result = base.ToContentItemDtoBase<IContent>(content);
//NOTE: we don't need this for the dto and it's an extra lookup
//result.ContentTypeAlias = content.ContentType.Alias;
//result.Icon = content.ContentType.Icon;
//result.Updator = userMapper.ToUserBasic(content.GetWriterProfile());
return result;
}
public ContentItemBasic<ContentPropertyBasic, IContent> ToContentItemSimple(IContent content)
{
var result = base.ToContentItemSimpleBase<IContent>(content);
result.ContentTypeAlias = content.ContentType.Alias;
result.Icon = content.ContentType.Icon;
result.Updator = UserMapper.ToUserBasic(content.GetWriterProfile());
return result;
}
//public ContentItemBasic<ContentPropertyBasic, IContent> ToContentItemSimple(IContent content)
//{
// var result = base.ToContentItemSimpleBase<IContent>(content);
// result.ContentTypeAlias = content.ContentType.Alias;
// result.Icon = content.ContentType.Icon;
// result.Updator = UserMapper.ToUserBasic(content.GetWriterProfile());
// return result;
//}
public ContentItemDisplay ToContentItemDisplay(IContent content)
{
//create the list of tabs for properties assigned to tabs.
var tabs = GetTabs(content);
//public ContentItemDisplay ToContentItemDisplay(IContent content)
//{
// //create the list of tabs for properties assigned to tabs.
// var tabs = GetTabs(content);
var result = CreateContent<ContentItemDisplay, ContentPropertyDisplay, IContent>(content, (display, originalContent) =>
{
//fill in the rest
display.Updator = UserMapper.ToUserBasic(content.GetWriterProfile());
display.ContentTypeAlias = content.ContentType.Alias;
display.Icon = content.ContentType.Icon;
// var result = CreateContent<ContentItemDisplay, ContentPropertyDisplay, IContent>(content, (display, originalContent) =>
// {
// //fill in the rest
// display.Updator = UserMapper.ToUserBasic(content.GetWriterProfile());
// display.ContentTypeAlias = content.ContentType.Alias;
// display.Icon = content.ContentType.Icon;
//set display props after the normal properties are alraedy mapped
display.Name = originalContent.Name;
display.Tabs = tabs;
//look up the published version of this item if it is not published
if (content.Published)
{
display.PublishDate = content.UpdateDate;
}
else if (content.HasPublishedVersion())
{
var published = ApplicationContext.Services.ContentService.GetPublishedVersion(content.Id);
display.PublishDate = published.UpdateDate;
}
else
{
display.PublishDate = null;
}
// //set display props after the normal properties are alraedy mapped
// display.Name = originalContent.Name;
// display.Tabs = tabs;
// //look up the published version of this item if it is not published
// if (content.Published)
// {
// display.PublishDate = content.UpdateDate;
// }
// else if (content.HasPublishedVersion())
// {
// var published = ApplicationContext.Services.ContentService.GetPublishedVersion(content.Id);
// display.PublishDate = published.UpdateDate;
// }
// else
// {
// display.PublishDate = null;
// }
}, null, false);
// }, null, false);
return result;
}
// return result;
//}
}
}