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

Changed all bulk operations to use one transaction unless it is a Lazy collection (this was mostly the case before)

Browse Source 
Fixed EventExtensions handling cancellations.
This commit is contained in:
Shannon Deminick
2012-12-15 21:27:15 +05:00
parent a925b092e7
commit 5fadb715c1
4 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Events/EventExtensions.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Core.Events
if (eventHandler != null)
eventHandler(sender, args);
return !args.Cancel;
return args.Cancel;
}
/// <summary>

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

@@ -604,7 +604,7 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
if (!Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
return false;
//Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
@@ -696,20 +696,18 @@ namespace Umbraco.Core.Services
/// <param name="userId">Optional Id of the User saving the Content</param>
public void Save(IEnumerable<IContent> contents, int userId = -1)
{
if (CollectionSaving.IsRaisedEventCancelled(new SaveEventArgs<IEnumerable>(contents), this))
return;
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
var containsNew = contents.Any(x => x.HasIdentity == false);
if (CollectionSaving.IsRaisedEventCancelled(new SaveEventArgs<IEnumerable>(contents), this))
return;
if (containsNew)
{
foreach (var content in contents)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
continue;
SetWriter(content, userId);
@@ -717,27 +715,21 @@ namespace Umbraco.Core.Services
if (content.Published)
content.ChangePublishedState(false);
repository.AddOrUpdate(content);
uow.Commit();
Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
repository.AddOrUpdate(content);
}
}
else
{
foreach (var content in contents)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
continue;
SetWriter(content, userId);
repository.AddOrUpdate(content);
uow.Commit();
Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
}
}
//Commit everything in one go
uow.Commit();
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(contents, false), this);
Audit.Add(AuditTypes.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, -1);
@@ -755,32 +747,32 @@ namespace Umbraco.Core.Services
/// <param name="userId">Optional Id of the User saving the Content</param>
public void Save(IEnumerable<Lazy<IContent>> contents, int userId = -1)
{
if (CollectionSaving.IsRaisedEventCancelled(new SaveEventArgs<IEnumerable>(contents), this))
return;
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
if (!CollectionSaving.IsRaisedEventCancelled(new SaveEventArgs<IEnumerable>(contents), this))
foreach (var content in contents)
{
foreach (var content in contents)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content.Value), this))
continue;
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content.Value), this))
continue;
SetWriter(content.Value, userId);
SetWriter(content.Value, userId);
//Only change the publish state if the "previous" version was actually published
if (content.Value.Published)
content.Value.ChangePublishedState(false);
//Only change the publish state if the "previous" version was actually published
if (content.Value.Published)
content.Value.ChangePublishedState(false);
repository.AddOrUpdate(content.Value);
uow.Commit();
repository.AddOrUpdate(content.Value);
uow.Commit();
Saved.RaiseEvent(new SaveEventArgs<IContent>(content.Value, false), this);
}
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(contents, false), this);
Audit.Add(AuditTypes.Save, "Bulk Save (lazy) content performed by user", userId == -1 ? 0 : userId, -1);
Saved.RaiseEvent(new SaveEventArgs<IContent>(content.Value, false), this);
}
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(contents, false), this);
Audit.Add(AuditTypes.Save, "Bulk Save (lazy) content performed by user", userId == -1 ? 0 : userId, -1);
}
}

22
src/Umbraco.Core/Services/ContentTypeService.cs
View File

@@ -147,16 +147,13 @@ namespace Umbraco.Core.Services
{
foreach (var contentType in contentTypes)
{
if (SavingContentType.IsRaisedEventCancelled(new SaveEventArgs<IContentType>(contentType), this))
continue;
SetUser(contentType, userId);
repository.AddOrUpdate(contentType);
uow.Commit();
SavedContentType.RaiseEvent(new SaveEventArgs<IContentType>(contentType, false), this);
repository.AddOrUpdate(contentType);
}
//save it all in one go
uow.Commit();
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(contentTypes, false), this);
}
@@ -364,16 +361,13 @@ namespace Umbraco.Core.Services
foreach (var mediaType in mediaTypes)
{
if (SavingMediaType.IsRaisedEventCancelled(new SaveEventArgs<IMediaType>(mediaType), this))
return;
SetUser(mediaType, userId);
repository.AddOrUpdate(mediaType);
uow.Commit();
SavedMediaType.RaiseEvent(new SaveEventArgs<IMediaType>(mediaType, false), this);
repository.AddOrUpdate(mediaType);
}
//save it all in one go
uow.Commit();
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(mediaTypes, false), this);
}

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

@@ -370,15 +370,12 @@ namespace Umbraco.Core.Services
foreach (var media in medias)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IMedia>(media), this))
continue;
SetUser(media, userId);
repository.AddOrUpdate(media);
uow.Commit();
Saved.RaiseEvent(new SaveEventArgs<IMedia>(media, false), this);
repository.AddOrUpdate(media);
}
//commit the whole lot in one go
uow.Commit();
CollectionSaved.RaiseEvent(new SaveEventArgs<IEnumerable>(medias, false), this);