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

Merge pull request #298 from KevinJump/6.2.0--PackageServiceFixes

Browse Source 
6.2.0  package service fixes
This commit is contained in:
Shandem
2014-03-19 14:43:19 +11:00
parent a0541b000e 366697f4eb
commit 09428d703c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -343,7 +343,9 @@ namespace Umbraco.Core.Services
foreach (var propertyType in contentType.PropertyTypes)
{
var definition = _dataTypeService.GetDataTypeDefinitionById(propertyType.DataTypeDefinitionId);
var propertyGroup = contentType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);
var propertyGroup = propertyType.PropertyGroupId == null
? null
: contentType.PropertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyGroupId.Value);
var genericProperty = new XElement("GenericProperty",
new XElement("Name", propertyType.Name),
new XElement("Alias", propertyType.Alias),
@@ -733,7 +735,7 @@ namespace Umbraco.Core.Services
var dataTypes = new Dictionary<string, IDataTypeDefinition>();
var dataTypeElements = name.Equals("DataTypes")
? (from doc in element.Elements("DataType") select doc).ToList()
: new List<XElement> { element.Element("DataType") };
: new List<XElement> { element };
foreach (var dataTypeElement in dataTypeElements)
{