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

Refactoring database changes from 4.10.0.

Browse Source 
Implementing the contnet type composition as part of U4-956.
This commit is contained in:
Morten@Thinkpad-X220
2012-10-10 07:15:51 -02:00
parent 0cceac97fc
commit 90108e344f
15 changed files with 147 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Core/Persistence/Relators/TabPropertyTypeRelator.cs
View File

@@ -5,9 +5,9 @@ namespace Umbraco.Core.Persistence.Relators
{
internal class TabPropertyTypeRelator
{
internal TabDto current;
internal PropertyTypeGroupDto current;
internal TabDto Map(TabDto a, PropertyTypeDto p, DataTypeDto d)
internal PropertyTypeGroupDto Map(PropertyTypeGroupDto a, PropertyTypeDto p, DataTypeDto d)
{
// Terminating call. Since we can return null from this function
// we need to be ready for PetaPoco to callback later with null
@@ -19,23 +19,23 @@ namespace Umbraco.Core.Persistence.Relators
if (p.DataTypeId == d.DataTypeId)
p.DataTypeDto = d;
// Is this the same Tab as the current one we're processing
// Is this the same Group as the current one we're processing
if (current != null && current.Id == a.Id)
{
// Yes, just add this PropertyType to the current Tab's collection of PropertyTypes
// Yes, just add this PropertyType to the current Group's collection of PropertyTypes
current.PropertyTypeDtos.Add(p);
// Return null to indicate we're not done with this Tab yet
// Return null to indicate we're not done with this Group yet
return null;
}
// This is a different Tab to the current one, or this is the
// This is a different Group to the current one, or this is the
// first time through and we don't have a Tab yet
// Save the current Tab
// Save the current Group
var prev = current;
// Setup the new current Tab
// Setup the new current Group
current = a;
current.PropertyTypeDtos = new List<PropertyTypeDto>();
current.PropertyTypeDtos.Add(p);