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

Cleanup - deleting non-empty containers

Browse Source
This commit is contained in:
Stephan
2016-06-08 12:52:42 +02:00
parent 88f9deda95
commit b2830f0c7d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/Services/ContentTypeServiceBase.cs
View File

@@ -829,9 +829,9 @@ namespace Umbraco.Core.Services
}
}
// FIXME should raise Changed events for the content type that is MOVED and ALL ITS CHILDREN IF ANY
// FIXME at the moment we don't have no MoveContainer don't we?!
// note: not raising any Changed event here because moving a content type under another container
// has no impact on the published content types - would be entirely different if we were to support
// moving a content type under another content type.
OnMoved(new MoveEventArgs<TItem>(false, evtMsgs, moveInfo.ToArray()));
@@ -983,7 +983,6 @@ namespace Umbraco.Core.Services
}
}
// fixme - what happens if deleting a non-empty container?
public Attempt<OperationStatus> DeleteContainer(int containerId, int userId = 0)
{
var evtMsgs = EventMessagesFactory.Get();
@@ -995,6 +994,11 @@ namespace Umbraco.Core.Services
var container = repo.Get(containerId);
if (container == null) return OperationStatus.Attempt.NoOperation(evtMsgs);
var erepo = uow.CreateRepository<IEntityRepository>();
var entity = erepo.Get(container.Id);
if (entity.HasChildren()) // because container.HasChildren() does not work?
return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCannot, evtMsgs)); // causes rollback
if (OnDeletingContainerCancelled(new DeleteEventArgs<EntityContainer>(container, evtMsgs)))
return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs)); // causes rollback

5
src/Umbraco.Core/Services/DataTypeService.cs
View File

@@ -166,6 +166,11 @@ namespace Umbraco.Core.Services
var container = repo.Get(containerId);
if (container == null) return OperationStatus.Attempt.NoOperation(evtMsgs);
var erepo = uow.CreateRepository<IEntityRepository>();
var entity = erepo.Get(container.Id);
if (entity.HasChildren()) // because container.HasChildren() does not work?
return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCannot, evtMsgs)); // causes rollback
if (DeletingContainer.IsRaisedEventCancelled(new DeleteEventArgs<EntityContainer>(container, evtMsgs), this))
return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs)); // causes rollback