Merge pull request #3714 from sbwalker/dev

fix site Hybrid behavior
oqtane · Jan 31, 2024 · cef56cb · cef56cb
2 parents 4575996 + 9776271
commit cef56cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;