From 97762712e64411967573a68e137293e99f78be07 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 31 Jan 2024 16:39:46 -0500 Subject: [PATCH] fix site Hybrid behavior --- Oqtane.Client/UI/SiteRouter.razor | 6 ++++++ Oqtane.Server/Components/App.razor | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 8f7aa120..3be45858 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -220,6 +220,12 @@ 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) { page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase)); diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor index 77463e78..6770c849 100644 --- a/Oqtane.Server/Components/App.razor +++ b/Oqtane.Server/Components/App.razor @@ -127,7 +127,7 @@ } 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; _prerender = site.Prerender;