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

Merge pull request #3820 from sbwalker/dev

Browse Source 
remove PageRepository reference in App
This commit is contained in:
Shaun Walker 2024-02-16 15:36:36 -05:00 committed by GitHub
commit 766a190015
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Oqtane.Server/Components/App.razor
View File

@ -21,7 +21,6 @@
@inject IConfigManager ConfigManager
@inject ITenantManager TenantManager
@inject ISiteService SiteService
@inject IPageRepository PageRepository
@inject IThemeRepository ThemeRepository
@inject ILanguageRepository LanguageRepository
@inject IServerStateManager ServerStateManager
@ -140,12 +139,19 @@
_prerender = site.Prerender;
Route route = new Route(url, alias.Path);
var page = PageRepository.GetPage(route.PagePath, site.SiteId);
if (page == null && route.PagePath == "" && site.HomePageId != null)
var page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
if (page == null && route.PagePath == "") // naked path refers to site home page
{
page = PageRepository.GetPage(site.HomePageId.Value);
if (site.HomePageId != null)
{
page = site.Pages.FirstOrDefault(item => item.PageId == site.HomePageId);
}
if (page == null)
{
// fallback to use the first page in the collection
page = site.Pages.FirstOrDefault();
}
}
if (page == null || page.IsDeleted)
{
HandlePageNotFound(site, page, route);
@ -233,10 +239,6 @@
}
// create initial PageState
// page needs to be populated
// site.modules need to be populated
// user needs to be populated
_pageState = new PageState
{
Alias = alias,