Merge pull request #3205 from sbwalker/dev

filter deleted pages and modules on the server
oqtane · Aug 28, 2023 · ad57d66 · ad57d66
2 parents b713cf8 + db2c42f
commit ad57d66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Oqtane.Client/UI/PageState.cs b/Oqtane.Client/UI/PageState.cs
@@ -28,11 +28,11 @@ public class PageState
 
         public List<Page> Pages
         {
-            get { return Site.Pages.Where(item => !item.IsDeleted).ToList(); }
+            get { return Site.Pages; }
         }
         public List<Module> Modules
         {
-            get { return Site.Modules.Where(item => !item.IsDeleted).ToList(); }
+            get { return Site.Modules; }
         }
         public List<Language> Languages
         {

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
@@ -398,7 +398,7 @@
             module.PaneModuleIndex = -1;
             module.PaneModuleCount = 0;
 
-            if ((module.PageId == page.PageId || module.ModuleId == moduleid))
+            if (module.PageId == page.PageId || module.ModuleId == moduleid)
             {
                 var typename = Constants.ErrorModule;
 

diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
@@ -91,7 +91,7 @@ private Site GetSite(int siteid)
                 site.Pages = new List<Page>();
                 foreach (Page page in _pages.GetPages(site.SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
+                    if (!page.IsDeleted && _userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
                     {
                         page.Settings = settings.Where(item => item.EntityId == page.PageId)
                             .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
@@ -107,7 +107,7 @@ private Site GetSite(int siteid)
                 site.Modules = new List<Module>();
                 foreach (PageModule pagemodule in _pageModules.GetPageModules(site.SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
+                    if (!pagemodule.IsDeleted && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
                     {
                         Module module = new Module();
                         module.SiteId = pagemodule.Module.SiteId;