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

Fixes U4-1534 so documents containing the tag datatype is properly copied.

Browse Source 
Copying a document with a Tags datatype on it would only work if a new TagRelationship is created.
This commit is contained in:
Morten Christensen
2013-01-24 13:49:41 -01:00
parent 23141e1e8c
commit 25f91cc0da
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Models/Content.cs
View File

@@ -312,6 +312,12 @@ namespace Umbraco.Core.Models
clone.Version = Guid.NewGuid();
clone.ResetIdentity();
foreach (var property in clone.Properties)
{
property.ResetIdentity();
property.Version = clone.Version;
}
return clone;
}

2
src/Umbraco.Core/Models/EntityBase/Entity.cs
View File

@@ -85,7 +85,7 @@ namespace Umbraco.Core.Models.EntityBase
}
}
protected void ResetIdentity()
internal virtual void ResetIdentity()
{
_hasIdentity = false;
_id = default(int);

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

@@ -791,9 +791,8 @@ namespace Umbraco.Core.Services
var copy = ((Content)content).Clone();
copy.ParentId = parentId;
// A copy should never be set to published
// automatically even if the original was
this.UnPublish(copy, userId);
// A copy should never be set to published automatically even if the original was.
copy.ChangePublishedState(PublishedState.Unpublished);
if (Copying.IsRaisedEventCancelled(new CopyEventArgs<IContent>(content, copy, parentId), this))
return null;
@@ -806,14 +805,15 @@ namespace Umbraco.Core.Services
repository.AddOrUpdate(copy);
uow.Commit();
var uploadFieldId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c");
if (content.Properties.Any(x => x.PropertyType.DataTypeId == uploadFieldId))
//Special case for the Upload DataType
var uploadDataTypeId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c");
if (content.Properties.Any(x => x.PropertyType.DataTypeId == uploadDataTypeId))
{
bool isUpdated = false;
var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
//Loop through properties to check if the content contains media that should be deleted
foreach (var property in content.Properties.Where(x => x.PropertyType.DataTypeId == uploadFieldId
foreach (var property in content.Properties.Where(x => x.PropertyType.DataTypeId == uploadDataTypeId
&& string.IsNullOrEmpty(x.Value.ToString()) == false))
{
if (fs.FileExists(IOHelper.MapPath(property.Value.ToString())))
@@ -841,6 +841,17 @@ namespace Umbraco.Core.Services
uow.Commit();
}
}
//Special case for the Tags DataType
var tagsDataTypeId = new Guid("4023e540-92f5-11dd-ad8b-0800200c9a66");
if (content.Properties.Any(x => x.PropertyType.DataTypeId == tagsDataTypeId))
{
var tags = uow.Database.Fetch<TagRelationshipDto>("WHERE nodeId = @Id", new {Id = content.Id});
foreach (var tag in tags)
{
uow.Database.Insert(new TagRelationshipDto {NodeId = copy.Id, TagId = tag.TagId});
}
}
}
//NOTE This 'Relation' part should eventually be delegated to a RelationService