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

Merge pull request #1179 from umbraco/temp-U4-8175

Browse Source 
U4-8175 - fix PropertyType.PropertyGroupId inconsistencies
This commit is contained in:
Shannon Deminick
2016-03-16 14:18:03 +01:00
parent bc5f651c64 ecdca378c6
commit fc7cfea4ad
7 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
View File

@@ -113,7 +113,7 @@ namespace Umbraco.Web.Models.Mapping
var genericProperties = new List<TPropertyType>();
// add generic properties local to this content type
var entityGenericProperties = source.PropertyTypes.Where(x => x.PropertyGroupId == null || x.PropertyGroupId.Value == 0);
var entityGenericProperties = source.PropertyTypes.Where(x => x.PropertyGroupId == null);
genericProperties.AddRange(MapProperties(entityGenericProperties, source, PropertyGroupBasic.GenericPropertiesGroupId, false));
// add generic properties inherited through compositions