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

Merge branch 'temp8-U4-11227' into temp8-U4-11282

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
This commit is contained in:
Shannon
2018-05-08 12:31:03 +10:00
parent 0e19ec7495 3f73452bc7
commit 85c739aed4
144 changed files with 2598 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
View File

@@ -22,6 +22,12 @@ namespace Umbraco.Core.Services.Implement
// that one is always immediate (transactional)
public static event TypedEventHandler<TService, ContentTypeChange<TItem>.EventArgs> UowRefreshedEntity;
// used by tests to clear events
internal static void ClearScopeEvents()
{
UowRefreshedEntity = null;
}
// these must be dispatched
public static event TypedEventHandler<TService, SaveEventArgs<TItem>> Saving;
public static event TypedEventHandler<TService, SaveEventArgs<TItem>> Saved;