From 8985dcb4c0d61c549fe6a79de6a5668b7cb1da75 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 10 Apr 2023 08:37:35 -0400 Subject: [PATCH] fix #2736 - UI not loading correct module instance in scenarios where a module exists on multiple pages --- Oqtane.Client/UI/Pane.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor index d9f4f299..ccaaf0c3 100644 --- a/Oqtane.Client/UI/Pane.razor +++ b/Oqtane.Client/UI/Pane.razor @@ -58,7 +58,7 @@ else } if (Name.ToLower() == pane.ToLower()) { - Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); + Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId); if (module != null) { var moduleType = Type.GetType(module.ModuleType); @@ -107,7 +107,7 @@ else { if (PageState.ModuleId != -1) { - Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); + Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId); if (module != null && module.Pane.ToLower() == Name.ToLower()) { // check if user is authorized to view module