kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4472 from sbwalker/dev

Browse Source 
fix #4471 - search pages not being added on upgrade
This commit is contained in:
Shaun Walker 2024-07-27 09:51:22 -04:00 committed by GitHub
commit 51ed0f6487
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Server/Infrastructure/UpgradeManager.cs
View File

@ -66,8 +66,8 @@ namespace Oqtane.Infrastructure
case "5.1.0": case "5.1.0":
Upgrade_5_1_0(tenant, scope); Upgrade_5_1_0(tenant, scope);
break; break;
case "5.2.0": case "5.2.1":
Upgrade_5_2_0(tenant, scope); Upgrade_5_2_1(tenant, scope);
break; break;
} }
} }
@ -201,7 +201,7 @@ namespace Oqtane.Infrastructure
} }
}; };
AddPagesToSites(scope, pageTemplates); AddPagesToSites(scope, tenant, pageTemplates);
} }
private void Upgrade_3_1_3(Tenant tenant, IServiceScope scope) private void Upgrade_3_1_3(Tenant tenant, IServiceScope scope)
@ -386,7 +386,7 @@ namespace Oqtane.Infrastructure
} }
} }
private void Upgrade_5_2_0(Tenant tenant, IServiceScope scope) private void Upgrade_5_2_1(Tenant tenant, IServiceScope scope)
{ {
var pageTemplates = new List<PageTemplate> var pageTemplates = new List<PageTemplate>
{ {
@ -438,14 +438,16 @@ namespace Oqtane.Infrastructure
} }
}; };
AddPagesToSites(scope, pageTemplates); AddPagesToSites(scope, tenant, pageTemplates);
} }
private void AddPagesToSites(IServiceScope scope, List<PageTemplate> pageTemplates) private void AddPagesToSites(IServiceScope scope, Tenant tenant, List<PageTemplate> pageTemplates)
{ {
var tenants = scope.ServiceProvider.GetRequiredService<ITenantManager>();
var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>(); var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
foreach (var site in sites.GetSites().ToList()) foreach (var site in sites.GetSites().ToList())
{ {
tenants.SetAlias(tenant.TenantId, site.SiteId);
sites.CreatePages(site, pageTemplates, null); sites.CreatePages(site, pageTemplates, null);
} }
} }

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.2.0"; public static readonly string Version = "5.2.1";
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 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,5.2.1";
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";