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

Merge temp-u4-8447 into temp-u4-8497

Browse Source
This commit is contained in:
Stephan
2016-05-30 18:38:47 +02:00
parent ba7638793f a514ffc258
commit 669d64dff4
14 changed files with 88 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Core/Services/MemberService.cs
View File

@@ -22,7 +22,6 @@ namespace Umbraco.Core.Services
public class MemberService : RepositoryService, IMemberService
{
private readonly IMemberGroupService _memberGroupService;
private IMemberTypeService _memberTypeService;
#region Constructor
@@ -37,20 +36,6 @@ namespace Umbraco.Core.Services
_memberGroupService = memberGroupService;
}
// don't change or remove this, will need it later
private IMemberTypeService MemberTypeService => _memberTypeService;
//// handle circular dependencies
//internal IMemberTypeService MemberTypeService
//{
// get
// {
// if (_memberTypeService == null)
// throw new InvalidOperationException("MemberService.MemberTypeService has not been initialized.");
// return _memberTypeService;
// }
// set { _memberTypeService = value; }
//}
#endregion
#region Count
@@ -1329,16 +1314,21 @@ namespace Umbraco.Core.Services
private IMemberType GetMemberType(string memberTypeAlias)
{
var memberType = MemberTypeService.Get(memberTypeAlias);
if (memberType == null)
throw new Exception(string.Format("No MemberType matching alias: \"{0}\".", memberTypeAlias));
return memberType;
}
Mandate.ParameterNotNullOrEmpty(memberTypeAlias, nameof(memberTypeAlias));
[Obsolete("use MemberTypeService.GetDefault()")] // fixme kill!
public string GetDefaultMemberType()
{
return MemberTypeService.GetDefault();
using (var uow = UowProvider.CreateUnitOfWork())
{
uow.ReadLock(Constants.Locks.MemberTypes);
var repository = uow.CreateRepository<IMemberTypeRepository>();
var memberType = repository.Get(memberTypeAlias);
if (memberType == null)
throw new Exception($"No MemberType matching the passed in Alias: '{memberTypeAlias}' was found"); // causes rollback
uow.Complete();
return memberType;
}
}
#endregion