lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 03:58:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix bug #91 - Page error occurs when manage contents after add "Archive Later" part to "Page"(2483)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-10-15 14:42:16 -07:00
parent 02a57cc505
commit ed0b69f420
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
View File

@@ -1,10 +1,14 @@
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Query.Dynamic;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Indexing;
using Orchard.Localization;
using Orchard.Search.Services; using Orchard.Search.Services;
using Orchard.Search.ViewModels; using Orchard.Search.ViewModels;
using Orchard.Settings; using Orchard.Settings;
using Orchard.Search.Models; using Orchard.Search.Models;
using Orchard.UI.Notify;
using System.Collections.Generic; using System.Collections.Generic;
using Orchard.Collections; using Orchard.Collections;
using Orchard.Themes; using Orchard.Themes;
@@ -15,20 +19,38 @@ namespace Orchard.Search.Controllers {
private readonly ISearchService _searchService; private readonly ISearchService _searchService;
private readonly IContentManager _contentManager; private readonly IContentManager _contentManager;
public SearchController(ISearchService searchService, IContentManager contentManager) { public SearchController(
IOrchardServices services,
ISearchService searchService,
IContentManager contentManager) {
Services = services;
_searchService = searchService; _searchService = searchService;
_contentManager = contentManager; _contentManager = contentManager;
T = NullLocalizer.Instance;
} }
private IOrchardServices Services { get; set; }
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; } protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index(string q, int page = 1, int pageSize = 10) { public ActionResult Index(string q, int page = 1, int pageSize = 10) {
var searchFields = CurrentSite.As<SearchSettingsPart>().SearchedFields; var searchFields = CurrentSite.As<SearchSettingsPart>().SearchedFields;
var searchHits = _searchService.Query(q, page, pageSize, IPageOfItems<ISearchHit> searchHits;
CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
searchFields, if (q.Trim().StartsWith("?") || q.Trim().StartsWith("*")) {
searchHit => searchHit); searchHits = new PageOfItems<ISearchHit>(new ISearchHit[] { });
Services.Notifier.Error(T("'*' or '?' not allowed as first character in WildcardQuery"));
}
else {
searchHits = _searchService.Query(q, page, pageSize,
CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
searchFields,
searchHit => searchHit);
}
var searchResultViewModels = new List<SearchResultViewModel>(); var searchResultViewModels = new List<SearchResultViewModel>();