Merge remote-tracking branch 'upstream/dev' into UpdateTemplates
This commit is contained in:
@ -59,7 +59,7 @@ namespace Oqtane.Managers.Search
|
||||
try
|
||||
{
|
||||
var moduleSearch = (ISearchable)ActivatorUtilities.CreateInstance(_serviceProvider, type);
|
||||
var contentList = moduleSearch.GetSearchContentList(module, startTime.GetValueOrDefault(DateTime.MinValue));
|
||||
var contentList = moduleSearch.GetSearchContents(module, startTime.GetValueOrDefault(DateTime.MinValue));
|
||||
if(contentList != null)
|
||||
{
|
||||
foreach(var searchContent in contentList)
|
||||
|
@ -8,7 +8,7 @@ namespace Oqtane.Migrations.EntityBuilders
|
||||
public class SearchContentWordEntityBuilder : BaseEntityBuilder<SearchContentWordEntityBuilder>
|
||||
{
|
||||
private const string _entityTableName = "SearchContentWord";
|
||||
private readonly PrimaryKey<SearchContentWordEntityBuilder> _primaryKey = new("PK_SearchContentWord", x => x.SearchWordId);
|
||||
private readonly PrimaryKey<SearchContentWordEntityBuilder> _primaryKey = new("PK_SearchContentWord", x => x.SearchContentWordId);
|
||||
private readonly ForeignKey<SearchContentWordEntityBuilder> _foreignKey1 = new("FK_SearchContentWord_SearchContent", x => x.SearchContentId, "SearchContent", "SearchContentId", ReferentialAction.Cascade);
|
||||
private readonly ForeignKey<SearchContentWordEntityBuilder> _foreignKey2 = new("FK_SearchContentWord_SearchWord", x => x.SearchWordId, "SearchWord", "SearchWordId", ReferentialAction.Cascade);
|
||||
|
||||
|
@ -48,7 +48,7 @@ namespace Oqtane.Modules.HtmlText.Manager
|
||||
return content;
|
||||
}
|
||||
|
||||
public IList<SearchContent> GetSearchContentList(Module module, DateTime startDate)
|
||||
public List<SearchContent> GetSearchContents(Module module, DateTime startDate)
|
||||
{
|
||||
var searchContentList = new List<SearchContent>();
|
||||
|
||||
|
Reference in New Issue
Block a user