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

Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore

Browse Source 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
This commit is contained in:
Bjarke Berg
2020-12-07 11:56:38 +01:00
parent 1a35cf5164 7ff0f9ee20
commit 5dbddfffc5
46 changed files with 851 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Models/Mapping/ContentPropertyDisplayMapper.cs
View File

@@ -42,6 +42,7 @@ namespace Umbraco.Web.Models.Mapping
dest.Description = originalProp.PropertyType.Description;
dest.Label = originalProp.PropertyType.Name;
dest.HideLabel = valEditor.HideLabel;
dest.LabelOnTop = originalProp.PropertyType.LabelOnTop;
//add the validation information
dest.Validation.Mandatory = originalProp.PropertyType.Mandatory;

1
src/Umbraco.Core/Models/Mapping/ContentPropertyDtoMapper.cs
View File

@@ -27,6 +27,7 @@ namespace Umbraco.Web.Models.Mapping
dest.Description = property.PropertyType.Description;
dest.Label = property.PropertyType.Name;
dest.DataType = DataTypeService.GetDataType(property.PropertyType.DataTypeId);
dest.LabelOnTop = property.PropertyType.LabelOnTop;
}
}
}

2
src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Web.Models.Mapping
target.Id = source.Id;
target.IsActive = true;
target.Label = source.Name;
}
}
private void Map(IProperty source, ContentPropertyBasic target, MapperContext context)
{

3
src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -262,6 +262,7 @@ namespace Umbraco.Web.Models.Mapping
target.Alias = source.Alias;
target.Description = source.Description;
target.SortOrder = source.SortOrder;
target.LabelOnTop = source.LabelOnTop;
}
// no MapAll - take care
@@ -373,6 +374,7 @@ namespace Umbraco.Web.Models.Mapping
target.Label = source.Label;
target.SortOrder = source.SortOrder;
target.Validation = source.Validation;
target.LabelOnTop = source.LabelOnTop;
}
// Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked -DataTypeIcon -DataTypeName
@@ -393,6 +395,7 @@ namespace Umbraco.Web.Models.Mapping
target.MemberCanViewProperty = source.MemberCanViewProperty;
target.SortOrder = source.SortOrder;
target.Validation = source.Validation;
target.LabelOnTop = source.LabelOnTop;
}
// Umbraco.Code.MapAll -CreatorId -Level -SortOrder -Variations

1
src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs
View File

@@ -224,6 +224,7 @@ namespace Umbraco.Web.Models.Mapping
Id = p.Id,
Alias = p.Alias,
Description = p.Description,
LabelOnTop = p.LabelOnTop,
Editor = p.PropertyEditorAlias,
Validation = new PropertyTypeValidation
{