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

Cleanup rollback in content service

Browse Source
This commit is contained in:
Stephan
2018-10-19 12:47:04 +02:00
parent 89510148ac
commit 421cbf979c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Services/Implement/ContentService.cs
View File

@@ -2517,7 +2517,11 @@ namespace Umbraco.Core.Services.Implement
var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
//Emit RollingBack event aka before
scope.Events.Dispatch(RollingBack, this, rollbackEventArgs);
if (scope.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
{
scope.Complete();
return OperationResult.Cancel(evtMsgs);
}
//Copy the changes from the version
content.CopyFrom(version, culture);
@@ -2534,6 +2538,7 @@ namespace Umbraco.Core.Services.Implement
else
{
//Emit RolledBack event aka after
rollbackEventArgs.CanCancel = false;
scope.Events.Dispatch(RolledBack, this, rollbackEventArgs);
//Logging & Audit message