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

Manually merging a few changes to the ContentService, ContentFactory, ContentRepository and ContentExtensions to avoid a merge hell when pushing latest to the legacy refactor branch.

Browse Source 
Current checkin has a few new failing tests due to recent changes, but a few should be resolved by adding a DataTypesResolver setup in the ContentServiceTests fixture.
This commit is contained in:
Morten Christensen
2012-12-14 15:19:54 -01:00
parent 6bc5ba2b4c
commit f5bfb90b64
23 changed files with 894 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Models/Relation.cs
View File

@@ -18,10 +18,11 @@ namespace Umbraco.Core.Models
private RelationType _relationType;
private string _comment;
public Relation(int parentId, int childId)
public Relation(int parentId, int childId, RelationType relationType)
{
_parentId = parentId;
_childId = childId;
_relationType = relationType;
}
private static readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<Relation, int>(x => x.ParentId);