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

Adds Deleting/Deleted events to the EmptyRecycleBin methods of Content/Media services.

Browse Source
This commit is contained in:
Shannon Deminick
2012-12-21 07:42:37 +05:00
parent 2644c069ae
commit 446ff0591b
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,6 +785,7 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
//TODO: Why are we setting a writer if we are just deleting the object? (I'm probably overlooking something here...?)
SetWriter(content, userId);
repository.Delete(content);
uow.Commit();
@@ -944,6 +945,8 @@ namespace Umbraco.Core.Services
/// </summary>
public void EmptyRecycleBin()
{
//TODO: Why don't we have a base class to share between MediaService/ContentService as some of this is exacty the same?
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
@@ -952,7 +955,12 @@ namespace Umbraco.Core.Services
foreach (var content in contents)
{
if (Deleting.IsRaisedEventCancelled(new DeleteEventArgs<IContent>(content), this))
continue;
repository.Delete(content);
Deleted.RaiseEvent(new DeleteEventArgs<IContent>(content, false), this);
}
uow.Commit();
}

6
src/Umbraco.Core/Services/MediaService.cs
View File

@@ -303,7 +303,6 @@ namespace Umbraco.Core.Services
/// </summary>
public void EmptyRecycleBin()
{
//TODO: Should have an event for this.
//TODO: Why don't we have a base class to share between MediaService/ContentService as some of this is exacty the same?
var uow = _uowProvider.GetUnitOfWork();
@@ -314,7 +313,12 @@ namespace Umbraco.Core.Services
foreach (var content in contents)
{
if (Deleting.IsRaisedEventCancelled(new DeleteEventArgs<IMedia>(content), this))
continue;
repository.Delete(content);
Deleted.RaiseEvent(new DeleteEventArgs<IMedia>(content, false), this);
}
uow.Commit();
}