kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter deleted pages and modules on the server

Browse Source
This commit is contained in:
sbwalker 2023-08-28 17:15:31 -04:00
parent 11d02ccf44
commit db2c42f0f4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/UI/PageState.cs
View File

@ -28,11 +28,11 @@ namespace Oqtane.UI
public List<Page> Pages public List<Page> Pages
{ {
get { return Site.Pages.Where(item => !item.IsDeleted).ToList(); } get { return Site.Pages; }
} }
public List<Module> Modules public List<Module> Modules
{ {
get { return Site.Modules.Where(item => !item.IsDeleted).ToList(); } get { return Site.Modules; }
} }
public List<Language> Languages public List<Language> Languages
{ {

2
Oqtane.Client/UI/SiteRouter.razor
View File

@ -398,7 +398,7 @@
module.PaneModuleIndex = -1; module.PaneModuleIndex = -1;
module.PaneModuleCount = 0; module.PaneModuleCount = 0;
if ((module.PageId == page.PageId || module.ModuleId == moduleid)) if (module.PageId == page.PageId || module.ModuleId == moduleid)
{ {
var typename = Constants.ErrorModule; var typename = Constants.ErrorModule;

4
Oqtane.Server/Controllers/SiteController.cs
View File

@ -91,7 +91,7 @@ namespace Oqtane.Controllers
site.Pages = new List<Page>(); site.Pages = new List<Page>();
foreach (Page page in _pages.GetPages(site.SiteId)) 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) page.Settings = settings.Where(item => item.EntityId == page.PageId)
.Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList)) .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
@ -107,7 +107,7 @@ namespace Oqtane.Controllers
site.Modules = new List<Module>(); site.Modules = new List<Module>();
foreach (PageModule pagemodule in _pageModules.GetPageModules(site.SiteId)) 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 module = new Module();
module.SiteId = pagemodule.Module.SiteId; module.SiteId = pagemodule.Module.SiteId;