Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into UpdateTemplates

Browse Source
This commit is contained in:
Leigh Pointer
2024-06-11 08:49:28 +02:00
parent f013ee64a2 54549b261c
commit 3f16b908ca
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs
View File

@ -59,7 +59,7 @@ namespace Oqtane.Managers.Search
try try
{ {
var moduleSearch = (ISearchable)ActivatorUtilities.CreateInstance(_serviceProvider, type); 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) if(contentList != null)
{ {
foreach(var searchContent in contentList) foreach(var searchContent in contentList)

2
Oqtane.Server/Migrations/EntityBuilders/SearchContentWordEntityBuilder.cs
View File

@ -8,7 +8,7 @@ namespace Oqtane.Migrations.EntityBuilders
public class SearchContentWordEntityBuilder : BaseEntityBuilder<SearchContentWordEntityBuilder> public class SearchContentWordEntityBuilder : BaseEntityBuilder<SearchContentWordEntityBuilder>
{ {
private const string _entityTableName = "SearchContentWord"; 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> _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); private readonly ForeignKey<SearchContentWordEntityBuilder> _foreignKey2 = new("FK_SearchContentWord_SearchWord", x => x.SearchWordId, "SearchWord", "SearchWordId", ReferentialAction.Cascade);

2
Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs
View File

@ -48,7 +48,7 @@ namespace Oqtane.Modules.HtmlText.Manager
return content; return content;
} }
public IList<SearchContent> GetSearchContentList(Module module, DateTime startDate) public List<SearchContent> GetSearchContents(Module module, DateTime startDate)
{ {
var searchContentList = new List<SearchContent>(); var searchContentList = new List<SearchContent>();

5
Oqtane.Shared/Interfaces/ISearchable.cs
View File

@ -1,14 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Oqtane.Models; using Oqtane.Models;
namespace Oqtane.Interfaces namespace Oqtane.Interfaces
{ {
public interface ISearchable public interface ISearchable
{ {
public IList<SearchContent> GetSearchContentList(Module module, DateTime startTime); public List<SearchContent> GetSearchContents(Module module, DateTime startTime);
} }
} }

4
Oqtane.Shared/Shared/Constants.cs
View File

@ -4,8 +4,8 @@ namespace Oqtane.Shared
{ {
public class Constants public class Constants
{ {
public static readonly string Version = "5.1.2"; public static readonly string Version = "5.2.0";
public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2"; public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0";
public const string PackageId = "Oqtane.Framework"; public const string PackageId = "Oqtane.Framework";
public const string ClientId = "Oqtane.Client"; public const string ClientId = "Oqtane.Client";
public const string UpdaterPackageId = "Oqtane.Updater"; public const string UpdaterPackageId = "Oqtane.Updater";