From 06e53a3f366f5dc56f5f5317d71802faf83e4e6e Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 24 May 2013 16:44:17 -0700 Subject: [PATCH] Backed out changeset: 48ce2450dca2 --HG-- branch : 1.x --- .../DefaultContentManager.cs | 38 ++++++++----------- .../ContentManagement/IContentManager.cs | 24 ++++++------ 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs index 3f3c61cff..903674f37 100644 --- a/src/Orchard/ContentManagement/DefaultContentManager.cs +++ b/src/Orchard/ContentManagement/DefaultContentManager.cs @@ -351,9 +351,7 @@ namespace Orchard.ContentManagement { return criteria.GetCriteriaByPath(segment) ?? criteria.CreateCriteria(segment, JoinType.LeftOuterJoin); } - public virtual void Publish(IContent content) { - var contentItem = content.ContentItem; - + public virtual void Publish(ContentItem contentItem) { if (contentItem.VersionRecord.Published) { return; } @@ -376,8 +374,7 @@ namespace Orchard.ContentManagement { Handlers.Invoke(handler => handler.Published(context), Logger); } - public virtual void Unpublish(IContent content) { - var contentItem = content.ContentItem; + public virtual void Unpublish(ContentItem contentItem) { ContentItem publishedItem; if (contentItem.VersionRecord.Published) { // the version passed in is the published one @@ -385,7 +382,7 @@ namespace Orchard.ContentManagement { } else { // try to locate the published version of this item - publishedItem = Get(content.Id, VersionOptions.Published); + publishedItem = Get(contentItem.Id, VersionOptions.Published); } if (publishedItem == null) { @@ -407,9 +404,9 @@ namespace Orchard.ContentManagement { Handlers.Invoke(handler => handler.Unpublished(context), Logger); } - public virtual void Remove(IContent content) { - var activeVersions = _contentItemVersionRepository.Fetch(x => x.ContentItemRecord == content.ContentItem.Record && (x.Published || x.Latest)); - var context = new RemoveContentContext(content.ContentItem); + public virtual void Remove(ContentItem contentItem) { + var activeVersions = _contentItemVersionRepository.Fetch(x => x.ContentItemRecord == contentItem.Record && (x.Published || x.Latest)); + var context = new RemoveContentContext(contentItem); Handlers.Invoke(handler => handler.Removing(context), Logger); @@ -425,8 +422,7 @@ namespace Orchard.ContentManagement { Handlers.Invoke(handler => handler.Removed(context), Logger); } - protected virtual ContentItem BuildNewVersion(IContent existingContent) { - var existingContentItem = existingContent.ContentItem; + protected virtual ContentItem BuildNewVersion(ContentItem existingContentItem) { var contentItemRecord = existingContentItem.Record; // locate the existing and the current latest versions, allocate building version @@ -470,13 +466,11 @@ namespace Orchard.ContentManagement { return context.BuildingContentItem; } - public virtual void Create(IContent content) { - Create(content, VersionOptions.Published); + public virtual void Create(ContentItem contentItem) { + Create(contentItem, VersionOptions.Published); } - public virtual void Create(IContent content, VersionOptions options) { - var contentItem = content.ContentItem; - + public virtual void Create(ContentItem contentItem, VersionOptions options) { if (contentItem.VersionRecord == null) { // produce root record to determine the model id contentItem.VersionRecord = new ContentItemVersionRecord { @@ -698,8 +692,8 @@ namespace Orchard.ContentManagement { } } - public XElement Export(IContent content) { - var context = new ExportContentContext(content.ContentItem, new XElement(XmlConvert.EncodeLocalName(content.ContentItem.ContentType))); + public XElement Export(ContentItem contentItem) { + var context = new ExportContentContext(contentItem, new XElement(XmlConvert.EncodeLocalName(contentItem.ContentType))); foreach (var contentHandler in Handlers) { contentHandler.Exporting(context); @@ -709,8 +703,8 @@ namespace Orchard.ContentManagement { contentHandler.Exported(context); } - context.Data.SetAttributeValue("Id", GetItemMetadata(content).Identity.ToString()); - if (content.IsPublished()) { + context.Data.SetAttributeValue("Id", GetItemMetadata(contentItem).Identity.ToString()); + if (contentItem.IsPublished()) { context.Data.SetAttributeValue("Status", Published); } else { @@ -736,8 +730,8 @@ namespace Orchard.ContentManagement { return _contentTypeRepository.Get(contentTypeId); } - public void Index(IContent content, IDocumentIndex documentIndex) { - var indexContentContext = new IndexContentContext(content.ContentItem, documentIndex); + public void Index(ContentItem contentItem, IDocumentIndex documentIndex) { + var indexContentContext = new IndexContentContext(contentItem, documentIndex); // dispatch to handlers to retrieve index information Handlers.Invoke(handler => handler.Indexing(indexContentContext), Logger); diff --git a/src/Orchard/ContentManagement/IContentManager.cs b/src/Orchard/ContentManagement/IContentManager.cs index 37d610b11..bd03d3708 100644 --- a/src/Orchard/ContentManagement/IContentManager.cs +++ b/src/Orchard/ContentManagement/IContentManager.cs @@ -24,14 +24,14 @@ namespace Orchard.ContentManagement { /// Creates (persists) a new content item /// /// The content instance filled with all necessary data - void Create(IContent content); + void Create(ContentItem contentItem); /// /// Creates (persists) a new content item with the specified version /// /// The content instance filled with all necessary data /// The version to create the item with - void Create(IContent content, VersionOptions options); + void Create(ContentItem contentItem, VersionOptions options); /// @@ -65,12 +65,12 @@ namespace Orchard.ContentManagement { IEnumerable GetManyByVersionId(IEnumerable versionRecordIds, QueryHints hints) where T : class, IContent; IEnumerable GetManyByVersionId(IEnumerable versionRecordIds, QueryHints hints); - void Publish(IContent content); - void Unpublish(IContent content); - void Remove(IContent content); - void Index(IContent content, IDocumentIndex documentIndex); + void Publish(ContentItem contentItem); + void Unpublish(ContentItem contentItem); + void Remove(ContentItem contentItem); + void Index(ContentItem contentItem, IDocumentIndex documentIndex); - XElement Export(IContent content); + XElement Export(ContentItem contentItem); void Import(XElement element, ImportContentSession importContentSession); /// @@ -84,11 +84,11 @@ namespace Orchard.ContentManagement { IContentQuery Query(); IHqlQuery HqlQuery(); - ContentItemMetadata GetItemMetadata(IContent content); - IEnumerable GetEditorGroupInfos(IContent content); - IEnumerable GetDisplayGroupInfos(IContent content); - GroupInfo GetEditorGroupInfo(IContent content, string groupInfoId); - GroupInfo GetDisplayGroupInfo(IContent content, string groupInfoId); + ContentItemMetadata GetItemMetadata(IContent contentItem); + IEnumerable GetEditorGroupInfos(IContent contentItem); + IEnumerable GetDisplayGroupInfos(IContent contentItem); + GroupInfo GetEditorGroupInfo(IContent contentItem, string groupInfoId); + GroupInfo GetDisplayGroupInfo(IContent contentItem, string groupInfoId); ContentItem ResolveIdentity(ContentIdentity contentIdentity);