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

#17928: Using same filtering criteria for both the search and the search count.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-06-09 13:38:39 -07:00
parent b1a1dd969c
commit 6e25797b28
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+13 -13
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Web.Mvc;
using System.Web.Routing;
using System.Xml.Linq;
@@ -10,6 +11,7 @@ using Orchard.Environment.Extensions.Models;
using Orchard.Localization;
using Orchard.Packaging.Events;
using Orchard.Packaging.Extensions;
using Orchard.Packaging.GalleryServer;
using Orchard.Packaging.Models;
using Orchard.Packaging.Services;
using Orchard.Packaging.ViewModels;
@@ -151,16 +153,17 @@ namespace Orchard.Packaging.Controllers {
int totalCount = 0;
foreach (var source in sources) {
try {
Expression<Func<PublishedPackage, bool>> packagesCriteria = p => p.PackageType == packageType &&
p.IsLatestVersion &&
(string.IsNullOrEmpty(options.SearchText)
|| p.Title.Contains(options.SearchText)
|| p.Description.Contains(options.SearchText)
|| p.Tags.Contains(options.SearchText));
var sourceExtensions = _packagingSourceManager.GetExtensionList(true,
source,
packages => {
packages = packages.Where(p => p.PackageType == packageType &&
p.IsLatestVersion &&
(string.IsNullOrEmpty(options.SearchText)
|| p.Title.Contains(options.SearchText)
|| p.Description.Contains(options.SearchText)
|| p.Tags.Contains(options.SearchText)
));
packages = packages.Where(packagesCriteria);
switch (options.Order) {
case PackagingExtensionsOrder.Downloads:
@@ -174,8 +177,8 @@ namespace Orchard.Packaging.Controllers {
break;
}
if(pager.PageSize != 0) {
packages = packages.Skip((pager.Page - 1)*pager.PageSize).Take(pager.PageSize);
if (pager.PageSize != 0) {
packages = packages.Skip((pager.Page - 1) * pager.PageSize).Take(pager.PageSize);
}
return packages;
@@ -184,10 +187,7 @@ namespace Orchard.Packaging.Controllers {
// count packages separately to prevent loading everything just to count
totalCount += _packagingSourceManager.GetExtensionCount(
source,
packages => packages.Where(p => p.PackageType == packageType &&
p.IsLatestVersion &&
(string.IsNullOrEmpty(options.SearchText) || p.Title.Contains(options.SearchText)))
);
packages => packages.Where(packagesCriteria));
extensions = extensions == null ? sourceExtensions : extensions.Concat(sourceExtensions);