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

Merge pull request #3714 from sbwalker/dev

Browse Source 
fix site Hybrid behavior
This commit is contained in:
Shaun Walker 2024-01-31 16:40:09 -05:00 committed by GitHub
commit cef56cb5f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/UI/SiteRouter.razor
View File

@ -220,6 +220,12 @@
if (site != null) if (site != null)
{ {
if (Runtime == "Hybrid" && !site.Hybrid)
{
_error = "Hybrid Integration Is Not Enabled For This Site";
return;
}
if (PageState == null || refresh || PageState.Page.Path != route.PagePath) if (PageState == null || refresh || PageState.Page.Path != route.PagePath)
{ {
page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase)); page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));

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

@ -127,7 +127,7 @@
} }
var site = SiteRepository.GetSite(alias.SiteId); var site = SiteRepository.GetSite(alias.SiteId);
if (site != null && (!site.IsDeleted || url.Contains("admin/site")) && !site.Hybrid) if (site != null && (!site.IsDeleted || url.Contains("admin/site")))
{ {
_renderMode = site.RenderMode; _renderMode = site.RenderMode;
_prerender = site.Prerender; _prerender = site.Prerender;