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

ignore system properties

Browse Source
This commit is contained in:
Per Ploug
2015-06-08 18:16:41 +02:00
parent 7b06c37f44
commit 8ec652c557
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,12 +90,13 @@ namespace Umbraco.Web.Models.Mapping
//get all generic properties not already mapped to the generic props collection
var ownGenericProperties = source.CompositionPropertyTypes.Where(x => x.PropertyGroupId == null && genericProperties.Any(y => y.Id == x.Id));
var ownGenericProperties = source.CompositionPropertyTypes.Where(x => x.PropertyGroupId == null && !genericProperties.Any(y => y.Id == x.Id));
genericProperties.AddRange(MapProperties(ownGenericProperties, source, 0, false));
if (genericProperties.Any())
{
var genericTab = new PropertyGroupDisplay() { Id = 0, Name = "Generic properties", ParentGroupId = 0, ContentTypeId = source.Id, SortOrder = 999, Inherited = false };
var genericTab = new PropertyGroupDisplay() { Id = -666, Name = "Generic properties", ParentGroupId = 0, ContentTypeId = source.Id, SortOrder = 999, Inherited = false };
genericTab.Properties = genericProperties;
groups.Add(0, genericTab);
}
@@ -145,7 +146,7 @@ namespace Umbraco.Web.Models.Mapping
private IEnumerable<PropertyTypeDisplay> MapProperties(IEnumerable<PropertyType> properties, IContentTypeBase contentType, int groupId, bool inherited)
{
var mappedProperties = new List<PropertyTypeDisplay>();
foreach (var p in properties)
foreach (var p in properties.Where(x => x.DataTypeDefinitionId != 0) )
{
var editor = _propertyEditorResolver.Value.GetByAlias(p.PropertyEditorAlias);
var preVals = _applicationContext.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(p.DataTypeDefinitionId);