From aab0dd96ddafbfd4469345b7730330db36542fbd Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 6 Feb 2026 15:37:24 -0500 Subject: [PATCH] fix issue when loading languages for content localization --- .../Infrastructure/Jobs/SynchronizationJob.cs | 26 +++++++++---------- Oqtane.Server/Services/SiteService.cs | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs index 78fb5026..356f9640 100644 --- a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs @@ -49,11 +49,11 @@ namespace Oqtane.Infrastructure List sites = null; List aliases = null; - // get groups - var groups = siteGroupDefinitionRepository.GetSiteGroupDefinitions(); + // get site groups + var siteGroupDefinitions = siteGroupDefinitionRepository.GetSiteGroupDefinitions(); - // iterate through groups which need to be synchronized - foreach (var group in groups.Where(item => item.Synchronization && item.Synchronize)) + // iterate through site groups which need to be synchronized + foreach (var siteGroupDefinition in siteGroupDefinitions.Where(item => item.Synchronization && item.Synchronize)) { // get data if (siteGroups == null) @@ -63,19 +63,19 @@ namespace Oqtane.Infrastructure aliases = aliasRepository.GetAliases().ToList(); } - var aliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == group.PrimarySiteId && item.IsDefault).Name; - log += $"Processing Primary Site: {sites.First(item => item.SiteId == group.PrimarySiteId).Name} - {CreateLink(aliasName)}
"; + 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 == siteGroupDefinition.PrimarySiteId).Name} - {CreateLink(aliasName)}
"; // get primary site - var primarySite = sites.FirstOrDefault(item => item.SiteId == group.PrimarySiteId); + var primarySite = sites.FirstOrDefault(item => item.SiteId == siteGroupDefinition.PrimarySiteId); if (primarySite != null) { // update flag to prevent job from processing group again - group.Synchronize = false; - siteGroupDefinitionRepository.UpdateSiteGroupDefinition(group); + siteGroupDefinition.Synchronize = false; + siteGroupDefinitionRepository.UpdateSiteGroupDefinition(siteGroupDefinition); - // iterate through sites in group - foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == group.SiteGroupDefinitionId && item.SiteId != group.PrimarySiteId)) + // iterate through sites in site group + foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == siteGroupDefinition.SiteGroupDefinitionId && item.SiteId != siteGroupDefinition.PrimarySiteId)) { // get secondary site var secondarySite = sites.FirstOrDefault(item => item.SiteId == siteGroup.SiteId); @@ -105,13 +105,13 @@ namespace Oqtane.Infrastructure } else { - log += $"Site Group {group.Name} Has A SiteId {siteGroup.SiteId} Which Does Not Exist
"; + log += $"Site Group {siteGroupDefinition.Name} Has A SiteId {siteGroup.SiteId} Which Does Not Exist
"; } } } else { - log += $"Site Group {group.Name} Has A PrimarySiteId {group.PrimarySiteId} Which Does Not Exist
"; + log += $"Site Group {siteGroupDefinition.Name} Has A PrimarySiteId {siteGroupDefinition.PrimarySiteId} Which Does Not Exist
"; } } diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs index f8a50351..1cab31b9 100644 --- a/Oqtane.Server/Services/SiteService.cs +++ b/Oqtane.Server/Services/SiteService.cs @@ -334,7 +334,7 @@ namespace Oqtane.Services var alias = aliases.FirstOrDefault(item => item.SiteId == siteGroup.SiteId && item.TenantId == tenantId && item.IsDefault); 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 }); } } }