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

Post-merge fixes

Browse Source
This commit is contained in:
Stephan
2018-07-12 17:36:23 +02:00
parent 20293fb50d
commit 2051caaa01
16 changed files with 296 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Services/Implement/RelationService.cs
View File

@@ -217,8 +217,6 @@ namespace Umbraco.Core.Services.Implement
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
var rtQuery = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
var relationType = _relationTypeRepository.Get(rtQuery).FirstOrDefault();
if (relationType == null)
@@ -244,7 +242,6 @@ namespace Umbraco.Core.Services.Implement
relationTypeIds = relationTypes.Select(x => x.Id).ToList();
}
return relationTypeIds.Count == 0
? Enumerable.Empty<IRelation>()
: GetRelationsByListOfTypeIds(relationTypeIds);
@@ -265,7 +262,6 @@ namespace Umbraco.Core.Services.Implement
relationTypeIds = relationTypes.Select(x => x.Id).ToList();
}
return relationTypeIds.Count == 0
? Enumerable.Empty<IRelation>()
: GetRelationsByListOfTypeIds(relationTypeIds);
@@ -668,7 +664,6 @@ namespace Umbraco.Core.Services.Implement
var relations = new List<IRelation>();
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
foreach (var relationTypeId in relationTypeIds)
{
var id = relationTypeId;