lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19003: Fixing import/export when alias already exists on a different content type

Browse Source 
Work Item: 19003

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-21 14:55:34 -07:00
parent 125f6f81b0
commit 736b4cb4ae
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard/ContentManagement/DefaultContentManager.cs
View File

@@ -580,7 +580,7 @@ namespace Orchard.ContentManagement {
var identity = elementId.Value; var identity = elementId.Value;
var status = element.Attribute("Status"); var status = element.Attribute("Status");
var item = importContentSession.Get(identity); var item = importContentSession.Get(identity, XmlConvert.DecodeName(element.Name.LocalName));
if (item == null) { if (item == null) {
item = New(XmlConvert.DecodeName(element.Name.LocalName)); item = New(XmlConvert.DecodeName(element.Name.LocalName));
if (status != null && status.Value == "Draft") { if (status != null && status.Value == "Draft") {

18
src/Orchard/ContentManagement/ImportContentSession.cs
View File

@@ -24,12 +24,20 @@ namespace Orchard.ContentManagement {
_contentTypes[contentIdentity] = contentType; _contentTypes[contentIdentity] = contentType;
} }
public ContentItem Get(string id) { public ContentItem Get(string id, string contentTypeHint = null) {
var contentIdentity = new ContentIdentity(id); var contentIdentity = new ContentIdentity(id);
// lookup in local cache // lookup in local cache
if (_identities.ContainsKey(contentIdentity)) if (_identities.ContainsKey(contentIdentity)) {
return _contentManager.Get(_identities[contentIdentity], VersionOptions.DraftRequired); var result = _contentManager.Get(_identities[contentIdentity], VersionOptions.DraftRequired);
// if two identities are conflicting, then ensure that there types are the same
// e.g., importing a blog as home page (alias=) and the current home page is a page, the blog
// won't be imported, and blog posts will be attached to the page
if (contentTypeHint == null || result.ContentType == contentTypeHint) {
return result;
}
}
// no result ? then check if there are some more content items to load from the db // no result ? then check if there are some more content items to load from the db
if(_lastIndex != int.MaxValue) { if(_lastIndex != int.MaxValue) {
@@ -79,8 +87,8 @@ namespace Orchard.ContentManagement {
} }
var contentItem = _contentManager.Create(_contentTypes[contentIdentity], VersionOptions.Draft); var contentItem = _contentManager.Create(_contentTypes[contentIdentity], VersionOptions.Draft);
_identities.Add(contentIdentity, contentItem.Id); _identities[contentIdentity] = contentItem.Id;
_contentItemIds.Add(contentItem.Id, contentIdentity); _contentItemIds[contentItem.Id] = contentIdentity;
return contentItem; return contentItem;
} }