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

#8878: Fixing that Projection Manager should apply the Version Scope even if there are multiple filter groups (#8880)

Browse Source
This commit is contained in:
Benedek Farkas
2026-01-12 17:04:21 +01:00
committed by GitHub
parent bbde34d9c5
commit 2a1c898ff2
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Projections/Services/IProjectionManager.cs
+7 -1
View File
@@ -5,6 +5,7 @@ using Orchard.Projections.Descriptors.Filter;
using Orchard.Projections.Descriptors.Layout; using Orchard.Projections.Descriptors.Layout;
using Orchard.Projections.Descriptors.Property; using Orchard.Projections.Descriptors.Property;
using Orchard.Projections.Descriptors.SortCriterion; using Orchard.Projections.Descriptors.SortCriterion;
using Orchard.Projections.Models;
namespace Orchard.Projections.Services namespace Orchard.Projections.Services
{ {
@@ -23,7 +24,12 @@ namespace Orchard.Projections.Services
IEnumerable<ContentItem> GetContentItems(int queryId, int skip = 0, int count = 0); IEnumerable<ContentItem> GetContentItems(int queryId, int skip = 0, int count = 0);
IEnumerable<ContentItem> GetContentItems(int queryId, ContentPart part, int skip = 0, int count = 0); IEnumerable<ContentItem> GetContentItems(int queryId, ContentPart part, int skip = 0, int count = 0);
IEnumerable<IHqlQuery> GetContentQueries(
QueryPartRecord queryRecord,
IEnumerable<SortCriterionRecord> sortCriteria,
Dictionary<string, object> tokens);
int GetCount(int queryId); int GetCount(int queryId);
int GetCount(int queryId, ContentPart part); int GetCount(int queryId, ContentPart part);
} }
} }
src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs
+11 -16
View File
@@ -128,7 +128,7 @@ namespace Orchard.Projections.Services
var queryRecord = _queryRepository.Get(queryId) ?? throw new ArgumentException("queryId"); var queryRecord = _queryRepository.Get(queryId) ?? throw new ArgumentException("queryId");
// Prepare tokens. // Prepare tokens.
Dictionary<string, object> tokens = new Dictionary<string, object>(); var tokens = new Dictionary<string, object>();
if (part != null) if (part != null)
{ {
tokens.Add("Content", part.ContentItem); tokens.Add("Content", part.ContentItem);
@@ -151,17 +151,11 @@ namespace Orchard.Projections.Services
{ {
var availableSortCriteria = DescribeSortCriteria().ToList(); var availableSortCriteria = DescribeSortCriteria().ToList();
var queryRecord = _queryRepository.Get(queryId); var queryRecord = _queryRepository.Get(queryId) ?? throw new ArgumentException("queryId");
if (queryRecord == null)
{
throw new ArgumentException("queryId");
}
var contentItems = new List<ContentItem>(); var contentItems = new List<ContentItem>();
// Prepare tokens. // Prepare tokens.
Dictionary<string, object> tokens = new Dictionary<string, object>(); var tokens = new Dictionary<string, object>();
if (part != null) if (part != null)
{ {
tokens.Add("Content", part.ContentItem); tokens.Add("Content", part.ContentItem);
@@ -186,7 +180,8 @@ namespace Orchard.Projections.Services
return Enumerable.Empty<ContentItem>(); return Enumerable.Empty<ContentItem>();
} }
var groupQuery = _contentManager.HqlQuery().Where(alias => alias.Named("ci"), x => x.InG("Id", ids)); var version = queryRecord.VersionScope.ToVersionOptions();
var groupQuery = _contentManager.HqlQuery().ForVersion(version).Where(alias => alias.Named("ci"), x => x.InG("Id", ids));
// Iterate over each sort criteria to apply the alterations to the query object. // Iterate over each sort criteria to apply the alterations to the query object.
foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position))
@@ -200,8 +195,8 @@ namespace Orchard.Projections.Services
Tokens = tokens Tokens = tokens
}; };
string category = sortCriterion.Category; var category = sortCriterion.Category;
string type = sortCriterion.Type; var type = sortCriterion.Type;
// Find specific sort criterion. // Find specific sort criterion.
var descriptor = availableSortCriteria var descriptor = availableSortCriteria
@@ -255,8 +250,8 @@ namespace Orchard.Projections.Services
Tokens = tokens Tokens = tokens
}; };
string category = filter.Category; var category = filter.Category;
string type = filter.Type; var type = filter.Type;
// Find specific filter. // Find specific filter.
var descriptor = availableFilters var descriptor = availableFilters
@@ -287,8 +282,8 @@ namespace Orchard.Projections.Services
Tokens = tokens Tokens = tokens
}; };
string category = sortCriterion.Category; var category = sortCriterion.Category;
string type = sortCriterion.Type; var type = sortCriterion.Type;
// Find specific sort criterion. // Find specific sort criterion.
var descriptor = availableSortCriteria var descriptor = availableSortCriteria