From e0c2b2982f79babb08d90e106470dfbd8da54d68 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Tue, 11 Apr 2023 13:01:34 -0400 Subject: [PATCH] improvements to #2736 to support scenarios where module is not explicitly assigned to a page --- Oqtane.Client/UI/Pane.razor | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor index 4ef60405..30b4f0f6 100644 --- a/Oqtane.Client/UI/Pane.razor +++ b/Oqtane.Client/UI/Pane.razor @@ -59,6 +59,10 @@ else if (Name.ToLower() == pane.ToLower()) { Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId); + if (module == null) + { + module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); + } if (module != null) { var moduleType = Type.GetType(module.ModuleType); @@ -107,8 +111,12 @@ else { if (PageState.ModuleId != -1) { - Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); - if (module != null && module.Pane.ToLower() == Name.ToLower()) + Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId); + if (module == null) + { + module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); + } + if (module != null && module.Pane.ToLower() == Name.ToLower()) { // check if user is authorized to view module if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))