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 2 Packages Projects Releases Wiki Activity

Adding optional QueryHints parameter.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-10-31 17:43:57 -07:00
parent f35ea47f57
commit 84d34276c7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.AuditTrail/Services/IRecycleBin.cs
View File

@@ -17,12 +17,12 @@ namespace Orchard.AuditTrail.Services {
/// <summary>
/// Returns the specified list of content items from the recycle bin.
/// </summary>
IEnumerable<ContentItem> GetMany(IEnumerable<int> contentItemIds);
IEnumerable<ContentItem> GetMany(IEnumerable<int> contentItemIds, QueryHints hints = null);
/// <summary>
/// Returns the specified list of content items from the recycle bin.
/// </summary>
IEnumerable<T> GetMany<T>(IEnumerable<int> contentItemIds) where T : class, IContent;
IEnumerable<T> GetMany<T>(IEnumerable<int> contentItemIds, QueryHints hints = null) where T : class, IContent;
/// <summary>
/// Restores the specified content item.

12
src/Orchard.Web/Modules/Orchard.AuditTrail/Services/RecycleBin.cs
View File

@@ -39,13 +39,13 @@ namespace Orchard.AuditTrail.Services {
};
}
public IEnumerable<ContentItem> GetMany(IEnumerable<int> contentItemIds) {
return GetMany<ContentItem>(contentItemIds);
public IEnumerable<ContentItem> GetMany(IEnumerable<int> contentItemIds, QueryHints hints = null) {
return GetMany<ContentItem>(contentItemIds, hints);
}
public IEnumerable<T> GetMany<T>(IEnumerable<int> contentItemIds) where T : class, IContent {
public IEnumerable<T> GetMany<T>(IEnumerable<int> contentItemIds, QueryHints hints = null) where T : class, IContent {
var query = GetDeletedVersionsQuery(contentItemIds);
return LoadContentItems<T>(query);
return LoadContentItems<T>(query, hints);
}
public ContentItem Restore(ContentItem contentItem) {
@@ -58,10 +58,10 @@ namespace Orchard.AuditTrail.Services {
return _contentManager.Restore(contentItem, VersionOptions.Restore(lastVersion.Number, publish: false));
}
private IEnumerable<T> LoadContentItems<T>(IQuery query) where T: class, IContent {
private IEnumerable<T> LoadContentItems<T>(IQuery query, QueryHints hints = null) where T: class, IContent {
var rows = query.List<object>();
var versionIds = rows.Cast<object[]>().Select(x => (int)x[0]);
return _contentManager.GetManyByVersionId<T>(versionIds, QueryHints.Empty);
return _contentManager.GetManyByVersionId<T>(versionIds, hints ?? QueryHints.Empty);
}
private IQuery GetDeletedVersionsQuery(IEnumerable<int> contentItemIds = null) {