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

19
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -22,7 +22,6 @@ namespace Umbraco.Core.Services
/// </summary>
public class ContentService : RepositoryService, IContentService, IContentServiceOperations
{
private IContentTypeService _contentTypeService;
#region Constructors
@@ -34,20 +33,6 @@ namespace Umbraco.Core.Services
{
}
// don't change or remove this, will need it later
private IContentTypeService ContentTypeService => _contentTypeService;
//// handle circular dependencies
//internal IContentTypeService ContentTypeService
//{
// get
// {
// if (_contentTypeService == null)
// throw new InvalidOperationException("ContentService.ContentTypeService has not been initialized.");
// return _contentTypeService;
// }
// set { _contentTypeService = value; }
//}
#endregion
#region Count
@@ -332,6 +317,8 @@ namespace Umbraco.Core.Services
var repo = uow.CreateRepository<IContentRepository>();
repo.AddOrUpdate(content);
uow.Flush(); // need everything so we can serialize
Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
TreeChanged.RaiseEvent(new TreeChange<IContent>(content, TreeChangeTypes.RefreshNode).ToEventArgs(), this);
}
@@ -2545,7 +2532,7 @@ namespace Umbraco.Core.Services
using (var uow = UowProvider.CreateUnitOfWork())
{
uow.ReadLock(Constants.Locks.ContentTree);
uow.ReadLock(Constants.Locks.ContentTypes);
var repository = uow.CreateRepository<IContentTypeRepository>();
var query = repository.Query.Where(x => x.Alias == contentTypeAlias);