Fixed missing logic from PR

This commit is contained in:
Cody 2023-04-19 10:18:27 -07:00 committed by GitHub
parent abf4ff71d7
commit d81fbe4585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,18 +30,19 @@ namespace Oqtane.Pages
private readonly Alias _alias; private readonly Alias _alias;
private string sitemapXml; private string sitemapXml;
public SitemapModel(IServiceProvider serviceProvider, IPageRepository pages, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, IUserPermissions userPermissions, IUrlMappingRepository urlMappings, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager) public SitemapModel(IServiceProvider serviceProvider, IPageRepository pages, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, ISettingRepository settings, IUserPermissions userPermissions, IUrlMappingRepository urlMappings, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
{ {
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
_pages = pages; _pages = pages;
_pageModules = pageModules; _pageModules = pageModules;
_moduleDefinitions = moduleDefinitions; _moduleDefinitions = moduleDefinitions;
_settings = settings;
_userPermissions = userPermissions; _userPermissions = userPermissions;
_logger = logger; _logger = logger;
_alias = tenantManager.GetAlias(); _alias = tenantManager.GetAlias();
} }
public IActionResult OnGetAsync() public IActionResult OnGet()
{ {
var sitemap = new List<Sitemap>(); var sitemap = new List<Sitemap>();
@ -66,6 +67,7 @@ namespace Oqtane.Pages
{ {
try try
{ {
pageModule.Module.Settings = _settings.GetSettings(EntityNames.Module, pageModule.ModuleId).ToDictionary(x => x.SettingName, x => x.SettingValue);
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype); var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
var urls = ((ISitemap)moduleobject).GetUrls(_alias.Path, page.Path, pageModule.Module); var urls = ((ISitemap)moduleobject).GetUrls(_alias.Path, page.Path, pageModule.Module);
foreach (var url in urls) foreach (var url in urls)
@ -107,10 +109,11 @@ namespace Oqtane.Pages
} }
writer.Close(); writer.Close();
} }
// Cache the sitemap XML
sitemapXml = builder.ToString(); sitemapXml = builder.ToString();
return Content(sitemapXml, "application/xml"); return Content(sitemapXml, "application/xml");
} }
} }
} }