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

DataType refactoring

Browse Source
This commit is contained in:
Stephan
2018-01-15 17:32:45 +01:00
parent 2f7f22961b
commit e30d8f79ef
62 changed files with 516 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Services/Implement/PackagingService.cs
View File

@@ -684,7 +684,7 @@ namespace Umbraco.Core.Services.Implement
{
var dataTypeDefinitionId = new Guid(property.Element("Definition").Value);//Unique Id for a DataTypeDefinition
var dataTypeDefinition = _dataTypeService.GetDataTypeDefinitionById(dataTypeDefinitionId);
var dataTypeDefinition = _dataTypeService.GetDataType(dataTypeDefinitionId);
//If no DataTypeDefinition with the guid from the xml wasn't found OR the ControlId on the DataTypeDefinition didn't match the DataType Id
//We look up a DataTypeDefinition that matches
@@ -698,7 +698,7 @@ namespace Umbraco.Core.Services.Implement
if (dataTypeDefinition == null)
{
var dataTypeDefinitions = _dataTypeService.GetDataTypeDefinitionByPropertyEditorAlias(propertyEditorAlias);
var dataTypeDefinitions = _dataTypeService.GetByEditorAlias(propertyEditorAlias);
if (dataTypeDefinitions != null && dataTypeDefinitions.Any())
{
dataTypeDefinition = dataTypeDefinitions.FirstOrDefault();
@@ -706,7 +706,7 @@ namespace Umbraco.Core.Services.Implement
}
else if (dataTypeDefinition.EditorAlias != propertyEditorAlias)
{
var dataTypeDefinitions = _dataTypeService.GetDataTypeDefinitionByPropertyEditorAlias(propertyEditorAlias);
var dataTypeDefinitions = _dataTypeService.GetByEditorAlias(propertyEditorAlias);
if (dataTypeDefinitions != null && dataTypeDefinitions.Any())
{
dataTypeDefinition = dataTypeDefinitions.FirstOrDefault();
@@ -724,7 +724,7 @@ namespace Umbraco.Core.Services.Implement
property.Element("Type").Value.Trim()));
//convert to a label!
dataTypeDefinition = _dataTypeService.GetDataTypeDefinitionByPropertyEditorAlias(Constants.PropertyEditors.NoEditAlias).FirstOrDefault();
dataTypeDefinition = _dataTypeService.GetByEditorAlias(Constants.PropertyEditors.NoEditAlias).FirstOrDefault();
//if for some odd reason this isn't there then ignore
if (dataTypeDefinition == null) continue;
}
@@ -884,7 +884,7 @@ namespace Umbraco.Core.Services.Implement
if (importedFolders.ContainsKey(dataTypeDefinitionName))
parentId = importedFolders[dataTypeDefinitionName];
var definition = _dataTypeService.GetDataTypeDefinitionById(dataTypeDefinitionId);
var definition = _dataTypeService.GetDataType(dataTypeDefinitionId);
//If the datatypedefinition doesn't already exist we create a new new according to the one in the package xml
if (definition == null)
{