lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#19579: Making every IContentManager method accept IContent instead of ContentItem

Browse Source 
Renaming arguments accordingly to "content" (as it was e.g. with BuildDisplay())
Work Item: 19579

--HG--
branch : 1.x
This commit is contained in:
Zoltán Lehóczky
2013-05-15 16:55:20 +02:00
parent fb7ab626d5
commit 6ca76c68bb
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,9 @@ namespace Orchard.ContentManagement {
return criteria.GetCriteriaByPath(segment) ?? criteria.CreateCriteria(segment, JoinType.LeftOuterJoin);
}
public virtual void Publish(ContentItem contentItem) {
public virtual void Publish(IContent content) {
var contentItem = content.ContentItem;
if (contentItem.VersionRecord.Published) {
return;
}
@@ -369,7 +371,8 @@ namespace Orchard.ContentManagement {
Handlers.Invoke(handler => handler.Published(context), Logger);
}
public virtual void Unpublish(ContentItem contentItem) {
public virtual void Unpublish(IContent content) {
var contentItem = content.ContentItem;
ContentItem publishedItem;
if (contentItem.VersionRecord.Published) {
// the version passed in is the published one
@@ -377,7 +380,7 @@ namespace Orchard.ContentManagement {
}
else {
// try to locate the published version of this item
publishedItem = Get(contentItem.Id, VersionOptions.Published);
publishedItem = Get(content.Id, VersionOptions.Published);
}
if (publishedItem == null) {
@@ -399,9 +402,9 @@ namespace Orchard.ContentManagement {
Handlers.Invoke(handler => handler.Unpublished(context), Logger);
}
public virtual void Remove(ContentItem contentItem) {
var activeVersions = _contentItemVersionRepository.Fetch(x => x.ContentItemRecord == contentItem.Record && (x.Published || x.Latest));
var context = new RemoveContentContext(contentItem);
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);
Handlers.Invoke(handler => handler.Removing(context), Logger);
@@ -417,7 +420,8 @@ namespace Orchard.ContentManagement {
Handlers.Invoke(handler => handler.Removed(context), Logger);
}
protected virtual ContentItem BuildNewVersion(ContentItem existingContentItem) {
protected virtual ContentItem BuildNewVersion(IContent existingContent) {
var existingContentItem = existingContent.ContentItem;
var contentItemRecord = existingContentItem.Record;
// locate the existing and the current latest versions, allocate building version
@@ -461,11 +465,13 @@ namespace Orchard.ContentManagement {
return context.BuildingContentItem;
}
public virtual void Create(ContentItem contentItem) {
Create(contentItem, VersionOptions.Published);
public virtual void Create(IContent content) {
Create(content, VersionOptions.Published);
}
public virtual void Create(ContentItem contentItem, VersionOptions options) {
public virtual void Create(IContent content, VersionOptions options) {
var contentItem = content.ContentItem;
if (contentItem.VersionRecord == null) {
// produce root record to determine the model id
contentItem.VersionRecord = new ContentItemVersionRecord {
@@ -687,8 +693,8 @@ namespace Orchard.ContentManagement {
}
}
public XElement Export(ContentItem contentItem) {
var context = new ExportContentContext(contentItem, new XElement(XmlConvert.EncodeLocalName(contentItem.ContentType)));
public XElement Export(IContent content) {
var context = new ExportContentContext(content.ContentItem, new XElement(XmlConvert.EncodeLocalName(content.ContentItem.ContentType)));
foreach (var contentHandler in Handlers) {
contentHandler.Exporting(context);
@@ -698,8 +704,8 @@ namespace Orchard.ContentManagement {
contentHandler.Exported(context);
}
context.Data.SetAttributeValue("Id", GetItemMetadata(contentItem).Identity.ToString());
if (contentItem.IsPublished()) {
context.Data.SetAttributeValue("Id", GetItemMetadata(content).Identity.ToString());
if (content.IsPublished()) {
context.Data.SetAttributeValue("Status", Published);
}
else {
@@ -725,8 +731,8 @@ namespace Orchard.ContentManagement {
return _contentTypeRepository.Get(contentTypeId);
}
public void Index(ContentItem contentItem, IDocumentIndex documentIndex) {
var indexContentContext = new IndexContentContext(contentItem, documentIndex);
public void Index(IContent content, IDocumentIndex documentIndex) {
var indexContentContext = new IndexContentContext(content.ContentItem, documentIndex);
// dispatch to handlers to retrieve index information
Handlers.Invoke(handler => handler.Indexing(indexContentContext), Logger);

24
src/Orchard/ContentManagement/IContentManager.cs
View File

@@ -24,14 +24,14 @@ namespace Orchard.ContentManagement {
/// Creates (persists) a new content item
/// </summary>
/// <param name="contentItem">The content item instance filled with all necessary data</param>
void Create(ContentItem contentItem);
void Create(IContent content);
/// <summary>
/// Creates (persists) a new content item with the specified version
/// </summary>
/// <param name="contentItem">The content item instance filled with all necessary data</param>
/// <param name="options">The version to create the item with</param>
void Create(ContentItem contentItem, VersionOptions options);
void Create(IContent content, VersionOptions options);
/// <summary>
@@ -64,12 +64,12 @@ namespace Orchard.ContentManagement {
IEnumerable<T> GetMany<T>(IEnumerable<int> ids, VersionOptions options, QueryHints hints) where T : class, IContent;
IEnumerable<T> GetManyByVersionId<T>(IEnumerable<int> versionRecordIds, QueryHints hints) where T : class, IContent;
void Publish(ContentItem contentItem);
void Unpublish(ContentItem contentItem);
void Remove(ContentItem contentItem);
void Index(ContentItem contentItem, IDocumentIndex documentIndex);
void Publish(IContent content);
void Unpublish(IContent content);
void Remove(IContent content);
void Index(IContent content, IDocumentIndex documentIndex);
XElement Export(ContentItem contentItem);
XElement Export(IContent content);
void Import(XElement element, ImportContentSession importContentSession);
/// <summary>
@@ -83,11 +83,11 @@ namespace Orchard.ContentManagement {
IContentQuery<ContentItem> Query();
IHqlQuery HqlQuery();
ContentItemMetadata GetItemMetadata(IContent contentItem);
IEnumerable<GroupInfo> GetEditorGroupInfos(IContent contentItem);
IEnumerable<GroupInfo> GetDisplayGroupInfos(IContent contentItem);
GroupInfo GetEditorGroupInfo(IContent contentItem, string groupInfoId);
GroupInfo GetDisplayGroupInfo(IContent contentItem, string groupInfoId);
ContentItemMetadata GetItemMetadata(IContent content);
IEnumerable<GroupInfo> GetEditorGroupInfos(IContent content);
IEnumerable<GroupInfo> GetDisplayGroupInfos(IContent content);
GroupInfo GetEditorGroupInfo(IContent content, string groupInfoId);
GroupInfo GetDisplayGroupInfo(IContent content, string groupInfoId);
ContentItem ResolveIdentity(ContentIdentity contentIdentity);