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

Correcting a few checks for multiple or single item imports in the PackagingService

Browse Source
This commit is contained in:
Morten Christensen
2013-03-22 13:58:21 -01:00
parent a1f01f9d5c
commit 98e53b3d74
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ namespace Umbraco.Core.Services
public IEnumerable<IContentType> ImportContentTypes(XElement element, int userId = 0)
{
var name = element.Name.LocalName;
if (name.Equals("DocumentTypes") == false && name.Equals("DocumentType"))
if (name.Equals("DocumentTypes") == false && name.Equals("DocumentType") == false)
{
throw new ArgumentException("The passed in XElement is not valid! It does not contain a root element called 'DocumentTypes' for multiple imports or 'DocumentType' for a single import.");
}
@@ -470,13 +470,16 @@ namespace Umbraco.Core.Services
public IEnumerable<IDataTypeDefinition> ImportDataTypeDefinitions(XElement element, int userId = 0)
{
var name = element.Name.LocalName;
if (name.Equals("DataTypes") == false)
if (name.Equals("DataTypes") == false && name.Equals("DataType") == false)
{
throw new ArgumentException("The passed in XElement is not valid! It does not contain a root element called 'DataTypes'.");
throw new ArgumentException("The passed in XElement is not valid! It does not contain a root element called 'DataTypes' for multiple imports or 'DataType' for a single import.");
}
var dataTypes = new Dictionary<string, IDataTypeDefinition>();
var dataTypeElements = element.Elements("DataType").ToList();
var dataTypeElements = name.Equals("DataTypes")
? (from doc in element.Elements("DataType") select doc).ToList()
: new List<XElement> {element.Element("DataType")};
foreach (var dataTypeElement in dataTypeElements)
{
var dataTypeDefinitionName = dataTypeElement.Attribute("Name").Value;
@@ -557,7 +560,7 @@ namespace Umbraco.Core.Services
public IEnumerable<ITemplate> ImportTemplates(XElement element, int userId = 0)
{
var name = element.Name.LocalName;
if (name.Equals("Templates") == false && name.Equals("Template"))
if (name.Equals("Templates") == false && name.Equals("Template") == false)
{
throw new ArgumentException("The passed in XElement is not valid! It does not contain a root element called 'Templates' for multiple imports or 'Template' for a single import.");
}