lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-22 22:22:04 -07:00
parent ca5e6af4f2 edd312f539
commit 1ee9e9cf24
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,13 +21,13 @@ namespace Orchard.Search.Controllers {
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index(string q, int page = 1, int pageSize = 10) {
var searchFields = CurrentSite.As<SearchSettings>().Record.SearchedFields.Split(new[] {',', ' '}, StringSplitOptions.RemoveEmptyEntries);
var searchFields = CurrentSite.As<SearchSettingsPart>().Record.SearchedFields.Split(new[] {',', ' '}, StringSplitOptions.RemoveEmptyEntries);
var searchViewModel = new SearchViewModel {
Query = q,
DefaultPageSize = 10, // <- yeah, I know :|
PageOfResults = _searchService.Query(q, page, pageSize,
CurrentSite.As<SearchSettings>().Record.FilterCulture,
CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
searchFields,
searchHit => new SearchResultViewModel {
Content = _contentManager.BuildDisplayModel(_contentManager.Get(searchHit.ContentItemId), "SummaryForSearch"),

2
src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
View File

@@ -5,7 +5,7 @@ namespace Orchard.Search.DataMigrations {
public int Create() {
SchemaBuilder.CreateTable("SearchSettingsRecord", table => table
SchemaBuilder.CreateTable("SearchSettingsPartRecord", table => table
.ContentPartRecord()
.Column<bool>("FilterCulture")
.Column<string>("SearchedFields")

8
src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsHandler.cs → src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
View File

@@ -5,11 +5,11 @@ using Orchard.ContentManagement.Handlers;
namespace Orchard.Search.Handlers {
[UsedImplicitly]
public class SearchSettingsHandler : ContentHandler {
public SearchSettingsHandler(IRepository<SearchSettingsRecord> repository) {
Filters.Add(new ActivatingFilter<SearchSettings>("Site"));
public class SearchSettingsPartHandler : ContentHandler {
public SearchSettingsPartHandler(IRepository<SearchSettingsPartRecord> repository) {
Filters.Add(new ActivatingFilter<SearchSettingsPart>("Site"));
Filters.Add(StorageFilter.For(repository));
Filters.Add(new TemplateFilterForRecord<SearchSettingsRecord>("CommentSettings", "Parts/Search.SiteSettings"));
Filters.Add(new TemplateFilterForRecord<SearchSettingsPartRecord>("CommentSettings", "Parts/Search.SiteSettings"));
}
}
}

6
src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettings.cs
View File

@@ -1,6 +0,0 @@
using Orchard.ContentManagement;
namespace Orchard.Search.Models {
public class SearchSettings : ContentPart<SearchSettingsRecord> {
}
}

6
src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs Normal file
View File

@@ -0,0 +1,6 @@
using Orchard.ContentManagement;
namespace Orchard.Search.Models {
public class SearchSettingsPart : ContentPart<SearchSettingsPartRecord> {
}
}

4
src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsRecord.cs → src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPartRecord.cs
View File

@@ -1,11 +1,11 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Search.Models {
public class SearchSettingsRecord : ContentPartRecord {
public class SearchSettingsPartRecord : ContentPartRecord {
public virtual bool FilterCulture { get; set; }
public virtual string SearchedFields { get; set; }
public SearchSettingsRecord() {
public SearchSettingsPartRecord() {
FilterCulture = false;
SearchedFields = "body, title";
}

6
src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
View File

@@ -68,10 +68,10 @@
<Compile Include="Controllers\SearchController.cs" />
<Compile Include="DataMigrations\SearchDataMigration.cs" />
<Compile Include="Filters\SearchFilter.cs" />
<Compile Include="Models\SearchSettings.cs" />
<Compile Include="Models\SearchSettingsRecord.cs" />
<Compile Include="Models\SearchSettingsPart.cs" />
<Compile Include="Models\SearchSettingsPartRecord.cs" />
<Compile Include="Routes.cs" />
<Compile Include="Handlers\SearchSettingsHandler.cs" />
<Compile Include="Handlers\SearchSettingsPartHandler.cs" />
<Compile Include="Services\ISearchService.cs" />
<Compile Include="Services\SearchService.cs" />
<Compile Include="ViewModels\SearchResultViewModel.cs" />

2
src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SearchSettingsRecord>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SearchSettingsPartRecord>" %>
<%@ Import Namespace="Orchard.Search.Models"%>
<fieldset>
<legend><%: T("Search")%></legend>