From e0b0302f5a16ab80ab97dd325fd7fef20caaba73 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Tue, 12 Dec 2023 22:56:02 +0100 Subject: [PATCH] Check for Deleted Pageds --- .../Modules/Admin/ModuleDefinitions/Edit.razor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 4fbc39fd..e8dc8111 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -310,16 +310,16 @@ // Group modules by PageId _groupedModules = PageState.Modules - .Where(md => md.ModuleDefinition.ModuleDefinitionId == _moduleDefinitionId) + .Where(md => md.ModuleDefinition.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false) .GroupBy(md => md.PageId) .Select(group => new GroupedModule { - Name = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key)?.Name, - Title = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key)?.Title, - PagePath = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key)?.Path, - PageUrl = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key)?.Url, + Name = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key && pg.IsDeleted == false)?.Name, + Title = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key && pg.IsDeleted == false)?.Title, + PagePath = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key && pg.IsDeleted == false)?.Path, + PageUrl = PageState.Pages.FirstOrDefault(pg => pg.PageId == group.Key && pg.IsDeleted == false)?.Url, Count = group.Count() - }) + }).Where(gm => gm.Name != null) .ToList(); _initialized = true; }