Skip to content

Commit 031ea32

Browse files
committed
Use DefaultIndexProfileName instead of DefaultIndexProfileId
1 parent 0685282 commit 031ea32

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Migrations/AzureAISearchIndexSettingsMigrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public int UpdateFrom1()
230230

231231
if (indexName == defaultSearchIndexName && defaultSearchProvider == "Azure AI Search")
232232
{
233-
site.Properties["SearchSettings"]["DefaultIndexProfileId"] = index.Id;
233+
site.Properties["SearchSettings"]["DefaultIndexProfileName"] = index.Name;
234234
saveSiteSettings = true;
235235
}
236236
}

src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Migrations/IndexingMigrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public int Create()
200200

201201
if (indexName == defaultSearchIndexName && defaultSearchProvider == "Elasticsearch")
202202
{
203-
site.Properties["SearchSettings"]["DefaultIndexProfileId"] = index.Id;
203+
site.Properties["SearchSettings"]["DefaultIndexProfileName"] = index.Name;
204204
saveSiteSettings = true;
205205
}
206206
}

src/OrchardCore.Modules/OrchardCore.Search.Lucene/DataMigrations/IndexingMigrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public int Create()
177177

178178
if (indexName == defaultSearchIndexName && defaultSearchProvider == "Lucene")
179179
{
180-
site.Properties["SearchSettings"]["DefaultIndexProfileId"] = index.Id;
180+
site.Properties["SearchSettings"]["DefaultIndexProfileName"] = index.Name;
181181
saveSiteSettings = true;
182182
}
183183
}

src/OrchardCore.Modules/OrchardCore.Search/Controllers/SearchController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ public async Task<IActionResult> Search(string index, string terms, PagerSlimPar
7373
if (!hasIndexName)
7474
{
7575
// Try to find the default index configured in site search settings.
76-
if (!string.IsNullOrEmpty(searchSettings.DefaultIndexProfileId))
76+
if (!string.IsNullOrEmpty(searchSettings.DefaultIndexProfileName))
7777
{
78-
indexProfile = await _indexProfileStore.FindByIdAsync(searchSettings.DefaultIndexProfileId);
78+
indexProfile = await _indexProfileStore.FindByNameAsync(searchSettings.DefaultIndexProfileName);
7979
}
8080

8181
if (indexProfile is null)

src/OrchardCore.Modules/OrchardCore.Search/Drivers/SearchSettingsDisplayDriver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, SearchSettings
4545

4646
return Initialize<SearchSettingsViewModel>("SearchSettings_Edit", async model =>
4747
{
48-
model.DefaultIndexId = settings.DefaultIndexProfileId;
48+
model.DefaultIndexProfileName = settings.DefaultIndexProfileName;
4949
model.Placeholder = settings.Placeholder;
5050
model.PageTitle = settings.PageTitle;
5151
model.Indexes = (await _indexProfileStore.GetAllAsync())
@@ -68,7 +68,7 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, SearchSetting
6868

6969
await context.Updater.TryUpdateModelAsync(model, Prefix);
7070

71-
section.DefaultIndexProfileId = model.DefaultIndexId;
71+
section.DefaultIndexProfileName = model.DefaultIndexProfileName;
7272
section.Placeholder = model.Placeholder;
7373
section.PageTitle = model.PageTitle;
7474

src/OrchardCore.Modules/OrchardCore.Search/ViewModel/SearchSettingsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace OrchardCore.Search.ViewModels;
55

66
public class SearchSettingsViewModel
77
{
8-
public string DefaultIndexId { get; set; }
8+
public string DefaultIndexProfileName { get; set; }
99

1010
public string Placeholder { get; set; }
1111

src/OrchardCore.Modules/OrchardCore.Search/Views/SearchSettings.Edit.cshtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
@if (Model.Indexes?.Count > 0)
44
{
5-
<div class="mb-3" asp-validation-class-for="DefaultIndexId">
6-
<label asp-for="DefaultIndexId" class="form-label">@T["Default search index"]</label>
7-
<select asp-for="DefaultIndexId" asp-items="Model.Indexes" class="form-select">
5+
<div class="mb-3" asp-validation-class-for="DefaultIndexProfileName">
6+
<label asp-for="DefaultIndexProfileName" class="form-label">@T["Default search index"]</label>
7+
<select asp-for="DefaultIndexProfileName" asp-items="Model.Indexes" class="form-select">
88
<option value="">@T["Select a default index"]</option>
99
</select>
10-
<span asp-validation-for="DefaultIndexId"></span>
10+
<span asp-validation-for="DefaultIndexProfileName"></span>
1111
<span class="hint">@T["The default index to use for the search page."]</span>
1212
</div>
1313

src/OrchardCore/OrchardCore.Search.Abstractions/Models/SearchSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace OrchardCore.Search.Models;
22

33
public class SearchSettings
44
{
5-
public string DefaultIndexProfileId { get; set; }
5+
public string DefaultIndexProfileName { get; set; }
66

77
[Obsolete("This property is no longer used. Instead use DefaultIndexId property to set the IndexProfile.Id.")]
88
public string ProviderName { get; set; }

0 commit comments

Comments
 (0)