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

fix issue when loading languages for content localization

Browse Source
This commit is contained in:
sbwalker
2026-02-06 15:37:24 -05:00
parent 57deeb6acf
commit aab0dd96dd
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
View File

@@ -49,11 +49,11 @@ namespace Oqtane.Infrastructure
List<Site> sites = null; List<Site> sites = null;
List<Alias> aliases = null; List<Alias> aliases = null;
// get groups // get site groups
var groups = siteGroupDefinitionRepository.GetSiteGroupDefinitions(); var siteGroupDefinitions = siteGroupDefinitionRepository.GetSiteGroupDefinitions();
// iterate through groups which need to be synchronized // iterate through site groups which need to be synchronized
foreach (var group in groups.Where(item => item.Synchronization && item.Synchronize)) foreach (var siteGroupDefinition in siteGroupDefinitions.Where(item => item.Synchronization && item.Synchronize))
{ {
// get data // get data
if (siteGroups == null) if (siteGroups == null)
@@ -63,19 +63,19 @@ namespace Oqtane.Infrastructure
aliases = aliasRepository.GetAliases().ToList(); aliases = aliasRepository.GetAliases().ToList();
} }
var aliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == group.PrimarySiteId && item.IsDefault).Name; var aliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == siteGroupDefinition.PrimarySiteId && item.IsDefault).Name;
log += $"Processing Primary Site: {sites.First(item => item.SiteId == group.PrimarySiteId).Name} - {CreateLink(aliasName)}<br />"; log += $"Processing Primary Site: {sites.First(item => item.SiteId == siteGroupDefinition.PrimarySiteId).Name} - {CreateLink(aliasName)}<br />";
// get primary site // get primary site
var primarySite = sites.FirstOrDefault(item => item.SiteId == group.PrimarySiteId); var primarySite = sites.FirstOrDefault(item => item.SiteId == siteGroupDefinition.PrimarySiteId);
if (primarySite != null) if (primarySite != null)
{ {
// update flag to prevent job from processing group again // update flag to prevent job from processing group again
group.Synchronize = false; siteGroupDefinition.Synchronize = false;
siteGroupDefinitionRepository.UpdateSiteGroupDefinition(group); siteGroupDefinitionRepository.UpdateSiteGroupDefinition(siteGroupDefinition);
// iterate through sites in group // iterate through sites in site group
foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == group.SiteGroupDefinitionId && item.SiteId != group.PrimarySiteId)) foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == siteGroupDefinition.SiteGroupDefinitionId && item.SiteId != siteGroupDefinition.PrimarySiteId))
{ {
// get secondary site // get secondary site
var secondarySite = sites.FirstOrDefault(item => item.SiteId == siteGroup.SiteId); var secondarySite = sites.FirstOrDefault(item => item.SiteId == siteGroup.SiteId);
@@ -105,13 +105,13 @@ namespace Oqtane.Infrastructure
} }
else else
{ {
log += $"Site Group {group.Name} Has A SiteId {siteGroup.SiteId} Which Does Not Exist<br />"; log += $"Site Group {siteGroupDefinition.Name} Has A SiteId {siteGroup.SiteId} Which Does Not Exist<br />";
} }
} }
} }
else else
{ {
log += $"Site Group {group.Name} Has A PrimarySiteId {group.PrimarySiteId} Which Does Not Exist<br />"; log += $"Site Group {siteGroupDefinition.Name} Has A PrimarySiteId {siteGroupDefinition.PrimarySiteId} Which Does Not Exist<br />";
} }
} }

2
Oqtane.Server/Services/SiteService.cs
View File

@@ -334,7 +334,7 @@ namespace Oqtane.Services
var alias = aliases.FirstOrDefault(item => item.SiteId == siteGroup.SiteId && item.TenantId == tenantId && item.IsDefault); var alias = aliases.FirstOrDefault(item => item.SiteId == siteGroup.SiteId && item.TenantId == tenantId && item.IsDefault);
if (alias != null) if (alias != null)
{ {
languages.Add(new Language { Code = site.CultureCode, Name = "", AliasName = alias.Name, IsDefault = true }); languages.Add(new Language { Code = site.CultureCode, Name = "", AliasName = alias.Name, IsDefault = false });
} }
} }
} }