From 69d639ee42ee39b3212f709c42d981629b019e69 Mon Sep 17 00:00:00 2001 From: Michael Atwood Date: Tue, 30 Jun 2020 13:42:35 -0700 Subject: [PATCH 1/2] Hot fix for homepage routing --- Oqtane.Client/UI/SiteRouter.razor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index c7235c1f..85666dd4 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -222,18 +222,18 @@ moduleid = result; if (actionPos > segments.Length - 1) { - path = path.Replace("/" + segments[modIdPos - 1] + "/" + segments[modIdPos], ""); + path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos], ""); } else { - path = path.Replace("/" + segments[modIdPos - 1] + "/" + segments[modIdPos] + "/" + segments[actionPos], ""); + path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos] + "/" + segments[actionPos], ""); } } if (urlParametersPos > 0) { - path = path.Replace("/" + segments[urlParametersPos - 1] + urlparameters, ""); + path = path.Replace("/" + segments[urlParametersPos - 1] + urlparameters + "/", ""); } // remove trailing slash so it can be used as a key for Pages From e7a4c08dea3cab105a3b8d2a9f8f2c4314569244 Mon Sep 17 00:00:00 2001 From: Michael Atwood Date: Tue, 30 Jun 2020 13:51:48 -0700 Subject: [PATCH 2/2] Now also properly routes in admin modules --- Oqtane.Client/UI/SiteRouter.razor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 85666dd4..21ee8575 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -222,18 +222,18 @@ moduleid = result; if (actionPos > segments.Length - 1) { - path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos], ""); + path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos] + "/", ""); } else { - path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos] + "/" + segments[actionPos], ""); + path = path.Replace(segments[modIdPos - 1] + "/" + segments[modIdPos] + "/" + segments[actionPos] + "/", ""); } } if (urlParametersPos > 0) { - path = path.Replace("/" + segments[urlParametersPos - 1] + urlparameters + "/", ""); + path = path.Replace(segments[urlParametersPos - 1] + urlparameters + "/", ""); } // remove trailing slash so it can be used as a key for Pages