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

Fixing MasterContentType for DocumentTypes.

Browse Source 
Adding ParentId "listener" to the repositories that uses ParentId, so we can ensure that the path is updated correctly.
Fixing how AllowedTemplates are saved upon creation of a new DocumentType.
Ensuring DocumentType.Save is called when creting a new DocumentType.
Fixing Publish/RePublish of Content with previously published children.
Removing UpdateDocumentCache in the save event of editContent.aspx.cs as its now handled in the new api.
Rewiring template methods on DocumentType class to use the new api.
This commit is contained in:
Morten Christensen
2012-12-20 14:29:08 -01:00
parent 6a05c4d968
commit 9f2d41286c
14 changed files with 109 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,17 +539,7 @@ namespace Umbraco.Core.Services
{
//TODO Refactor this so omitCacheRefresh isn't exposed in the public method, but only in an internal one as its purely there for legacy reasons.
//Look for children and unpublish them if any exists, otherwise just unpublish the passed in Content.
var children = GetChildrenDeep(content.Id);
var hasChildren = children.Any();
if (hasChildren)
children.Add(content);
var unpublished = hasChildren
? _publishingStrategy.UnPublish(children, userId)
: _publishingStrategy.UnPublish(content, userId);
var unpublished = _publishingStrategy.UnPublish(content, userId);
if (unpublished)
{
var uow = _uowProvider.GetUnitOfWork();
@@ -557,24 +547,8 @@ namespace Umbraco.Core.Services
{
repository.AddOrUpdate(content);
if (hasChildren)
{
foreach (var child in children)
{
SetWriter(child, userId);
repository.AddOrUpdate(child);
}
}
//Remove 'published' xml from the cmsContentXml table for the unpublished content and its (possible) children
//Remove 'published' xml from the cmsContentXml table for the unpublished content
uow.Database.Delete<ContentXmlDto>("WHERE nodeId = @Id", new {Id = content.Id});
if (hasChildren)
{
foreach (var child in children)
{
uow.Database.Delete<ContentXmlDto>("WHERE nodeId = @Id", new {Id = child.Id});
}
}
uow.Commit();
}
@@ -653,6 +627,15 @@ namespace Umbraco.Core.Services
if (omitCacheRefresh == false)
_publishingStrategy.PublishingFinalized(content);
if (HasChildren(content.Id))
{
var children = GetChildrenDeep(content.Id);
var shouldBeRepublished = children.Where(child => HasPublishedVersion(child.Id));
if (omitCacheRefresh == false)
_publishingStrategy.PublishingFinalized(shouldBeRepublished, false);
}
if (Saved != null)
Saved(content, e);