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

Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our

Browse Source 
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
This commit is contained in:
Shannon Deminick
2013-06-07 01:39:53 -10:00
parent 96fac60c3f
commit 9431ae7fdb
5 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ namespace Umbraco.Web.Models.Mapping
var tabs = content.PropertyGroups.Select(propertyGroup =>
{
//get the properties for the current tab
var propertiesForTab = content.GetPropertiesForGroup(propertyGroup);
var propertiesForTab = content.GetPropertiesForGroup(propertyGroup).ToArray();
//convert the properties to ContentPropertyDisplay objects
var displayProperties = propertiesForTab
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Models.Mapping
Id = 0,
Label = "Generic properties",
Alias = "Generic properties",
Properties = orphanProperties.Select(ToContentPropertyDisplay)
Properties = orphanProperties.Select(ToContentPropertyDisplay).ToArray()
});
var result = CreateContent<ContentItemDisplay, ContentPropertyDisplay>(content, (display, originalContent) =>
@@ -132,8 +132,8 @@ namespace Umbraco.Web.Models.Mapping
UpdateDate = content.UpdateDate,
CreateDate = content.CreateDate
};
if (createProperties)
result.Properties = content.Properties.Select(p => CreateProperty(p, propertyCreatedCallback));
if (createProperties)
result.Properties = content.Properties.Select(p => CreateProperty(p, propertyCreatedCallback)).ToArray();
if (contentCreatedCallback != null)
contentCreatedCallback(result, content);
return result;