lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing IProjectionManagerExtension, fixes #7455 (#8206)

Browse Source 
Lombiq Technologies: ORCH-201
This commit is contained in:
Gábor Domonkos
2019-05-18 20:56:38 +02:00
committed by Benedek Farkas
parent 2f96ccbd8a
commit 12c0a029fd
5 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
View File

@@ -24,7 +24,7 @@ using Orchard.Utility.Extensions;
namespace Orchard.Projections.Drivers {
public class ProjectionPartDriver : ContentPartDriver<ProjectionPart> {
private readonly IRepository<QueryPartRecord> _queryRepository;
private readonly IProjectionManagerExtension _projectionManager;
private readonly IProjectionManager _projectionManager;
private readonly IFeedManager _feedManager;
private readonly ITokenizer _tokenizer;
private readonly IDisplayHelperFactory _displayHelperFactory;
@@ -34,7 +34,7 @@ namespace Orchard.Projections.Drivers {
public ProjectionPartDriver(
IOrchardServices services,
IRepository<QueryPartRecord> queryRepository,
IProjectionManagerExtension projectionManager,
IProjectionManager projectionManager,
IFeedManager feedManager,
ITokenizer tokenizer,
IDisplayHelperFactory displayHelperFactory,

1
src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
View File

@@ -191,7 +191,6 @@
<Compile Include="QueryVersionScopeOptions.cs" />
<Compile Include="Services\DraftFieldIndexService.cs" />
<Compile Include="Services\IDraftFieldIndexService.cs" />
<Compile Include="Services\IProjectionManagerExtension.cs" />
<Compile Include="Shapes.cs" />
<Compile Include="Descriptors\Layout\LayoutComponentResult.cs" />
<Compile Include="Descriptors\Layout\LayoutContext.cs" />

8
src/Orchard.Web/Modules/Orchard.Projections/Services/IProjectionManager.cs
View File

@@ -1,9 +1,9 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Projections.Descriptors;
using Orchard.Projections.Descriptors.Property;
using Orchard.Projections.Descriptors.Filter;
using Orchard.Projections.Descriptors.Layout;
using Orchard.Projections.Descriptors.Property;
using Orchard.Projections.Descriptors.SortCriterion;
namespace Orchard.Projections.Services {
@@ -19,7 +19,9 @@ namespace Orchard.Projections.Services {
PropertyDescriptor GetProperty(string category, string type);
IEnumerable<ContentItem> GetContentItems(int queryId, int skip = 0, int count = 0);
int GetCount(int queryId);
}
IEnumerable<ContentItem> GetContentItems(int queryId, ContentPart part, int skip = 0, int count = 0);
int GetCount(int queryId);
int GetCount(int queryId, ContentPart part);
}
}

16
src/Orchard.Web/Modules/Orchard.Projections/Services/IProjectionManagerExtension.cs
View File

@@ -1,16 +0,0 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Projections.Descriptors;
using Orchard.Projections.Descriptors.Property;
using Orchard.Projections.Descriptors.Filter;
using Orchard.Projections.Descriptors.Layout;
using Orchard.Projections.Descriptors.SortCriterion;
namespace Orchard.Projections.Services {
public interface IProjectionManagerExtension : IProjectionManager {
IEnumerable<ContentItem> GetContentItems(int queryId, ContentPart part, int skip = 0, int count = 0);
int GetCount(int queryId, ContentPart part);
}
}

2
src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs
View File

@@ -14,7 +14,7 @@ using Orchard.Projections.Models;
using Orchard.Tokens;
namespace Orchard.Projections.Services {
public class ProjectionManager : IProjectionManagerExtension {
public class ProjectionManager : IProjectionManager {
private readonly ITokenizer _tokenizer;
private readonly IEnumerable<IFilterProvider> _filterProviders;
private readonly IEnumerable<ISortCriterionProvider> _sortCriterionProviders;