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

Fixes Move when parent is unpublished.

Browse Source
This commit is contained in:
Morten Christensen
2013-01-21 14:50:58 -01:00
parent e2b86cf2df
commit 4bf9cf270d
3 changed files with 68 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,7 @@ namespace Umbraco.Core.Services
{
using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))
{
var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path));
var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path) && x.Id != content.Id);
var contents = repository.GetByQuery(query);
return contents;
@@ -643,25 +643,7 @@ namespace Umbraco.Core.Services
/// <param name="userId">Optional Id of the User saving the Content</param>
public void Save(IContent content, int userId = -1)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
return;
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
SetWriter(content, userId);
//Only change the publish state if the "previous" version was actually published
if (content.Published)
content.ChangePublishedState(PublishedState.Saved);
repository.AddOrUpdate(content);
uow.Commit();
}
Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
Audit.Add(AuditTypes.Save, "Save Content performed by user", userId == -1 ? 0 : userId, content.Id);
Save(content, true, userId);
}
/// <summary>
@@ -917,6 +899,9 @@ namespace Umbraco.Core.Services
return;
SetWriter(content, userId);
var parent = GetById(parentId);
content.Path = string.Concat(parent.Path, ",", content.Id);
content.Level = parent.Level + 1;
//If Content is being moved away from Recycle Bin, its state should be un-trashed
if (content.Trashed && parentId != -20)
@@ -931,7 +916,28 @@ namespace Umbraco.Core.Services
//If Content is published, it should be (re)published from its new location
if (content.Published)
{
SaveAndPublish(content, userId);
//If Content is Publishable its saved and published
//otherwise we save the content without changing the publish state, and generate new xml because the Path, Level and Parent has changed.
if (IsPublishable(content))
{
SaveAndPublish(content, userId);
}
else
{
Save(content, false, userId);
using (var uow = _uowProvider.GetUnitOfWork())
{
var xml = content.ToXml();
var poco = new ContentXmlDto {NodeId = content.Id, Xml = xml.ToString(SaveOptions.None)};
var exists =
uow.Database.FirstOrDefault<ContentXmlDto>("WHERE nodeId = @Id", new {Id = content.Id}) !=
null;
int result = exists
? uow.Database.Update(poco)
: Convert.ToInt32(uow.Database.Insert(poco));
}
}
}
else
{
@@ -942,20 +948,10 @@ namespace Umbraco.Core.Services
var children = GetChildren(content.Id);
if (children.Any())
{
var parentPath = content.Path;
var parentLevel = content.Level;
var updatedDescendents = UpdatePathAndLevelOnChildren(children, parentPath, parentLevel);
//collection of descendents that needs to be saved and published
var descendentsToSaveAndPublish = updatedDescendents.Where(x => x.Published);
foreach (var c in descendentsToSaveAndPublish)
foreach (var child in children)
{
SaveAndPublish(c, userId);
Move(child, content.Id, userId);
}
//collection of descendents that only needs to be saved
var descendentsToSave = updatedDescendents.Where(x => x.Published == false);
Save(descendentsToSave, userId);
}
Moved.RaiseEvent(new MoveEventArgs<IContent>(content, false, parentId), this);
@@ -1162,6 +1158,35 @@ namespace Umbraco.Core.Services
#region Private Methods
/// <summary>
/// Saves a single <see cref="IContent"/> object
/// </summary>
/// <param name="content">The <see cref="IContent"/> to save</param>
/// <param name="changeState">Boolean indicating whether or not to change the Published state upon saving</param>
/// <param name="userId">Optional Id of the User saving the Content</param>
private void Save(IContent content, bool changeState, int userId = -1)
{
if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
return;
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
SetWriter(content, userId);
//Only change the publish state if the "previous" version was actually published
if (changeState && content.Published)
content.ChangePublishedState(PublishedState.Saved);
repository.AddOrUpdate(content);
uow.Commit();
}
Saved.RaiseEvent(new SaveEventArgs<IContent>(content, false), this);
Audit.Add(AuditTypes.Save, "Save Content performed by user", userId == -1 ? 0 : userId, content.Id);
}
/// <summary>
/// Gets a flat list of decendents of content from parent id
/// </summary>
@@ -1222,32 +1247,6 @@ namespace Umbraco.Core.Services
return true;
}
/// <summary>
/// Updates the Path and Level on a collection of <see cref="IContent"/> objects
/// based on the Parent's Path and Level.
/// </summary>
/// <param name="children">Collection of <see cref="IContent"/> objects to update</param>
/// <param name="parentPath">Path of the Parent content</param>
/// <param name="parentLevel">Level of the Parent content</param>
/// <returns>Collection of updated <see cref="IContent"/> objects</returns>
private List<IContent> UpdatePathAndLevelOnChildren(IEnumerable<IContent> children, string parentPath, int parentLevel)
{
var list = new List<IContent>();
foreach (var child in children)
{
child.Path = string.Concat(parentPath, ",", child.Id);
child.Level = parentLevel + 1;
list.Add(child);
var grandkids = GetChildren(child.Id);
if (grandkids.Any())
{
list.AddRange(UpdatePathAndLevelOnChildren(grandkids, child.Path, child.Level));
}
}
return list;
}
/// <summary>
/// Updates a content object with the User (id), who created the content.
/// </summary>

21
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
View File

@@ -261,26 +261,7 @@ namespace umbraco.dialogs
var documentId = int.Parse(helper.Request("id"));
var document = new Document(documentId);
document.Move(int.Parse(helper.Request("copyTo")));
if (document.Published)
{
//TODO HACK - Have to get the Document again, to get the new path from the database..
document = new Document(documentId);
document.Publish(new umbraco.BusinessLogic.User(0));
//using library.publish to support load balancing.
//umbraco.library.PublishSingleNode(d.Id);
umbraco.library.UpdateDocumentCache(document.Id);
//PPH added handling of load balanced moving of multiple nodes...
if (document.HasChildren)
handleChildNodes(document);
//Using the general Refresh content method instead as it supports load balancing.
//we only need to do this if the node is actually published.
library.RefreshContent();
}
document.Save(); //stub to save stuff to the db.
library.RefreshContent();
}
else
{

11
src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
View File

@@ -331,8 +331,15 @@ namespace umbraco.cms.presentation
_documentHasPublishedVersion = _document.HasPublishedVersion();
var descendants = ApplicationContext.Current.Services.ContentService.GetDescendants(_document.Id);
foreach (var descendant in descendants.Where(descendant => descendant.HasPublishedVersion()))
library.UpdateDocumentCache(descendant.Id);
var publishableDescendants = descendants.Where(descendant => descendant.HasPublishedVersion()).ToList();
if(publishableDescendants.Any())
{
foreach (var descendant in publishableDescendants)
{
library.UpdateDocumentCache(descendant.Id);
}
library.RefreshContent();
}
}
else
{