Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Allow scheduled jobs to set next execution date, fix issue in site settings where logo field was not being populated, fixed compositing issue where deleted modules were being rendered.

Browse Source
This commit is contained in:
Shaun Walker
2020-07-22 16:09:39 -04:00
parent bc73e5e3d0
commit 62a6b5f28a
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
{
_moduleState = Module; // passed in from Pane component
string container = _moduleState.ContainerType;
if (PageState.ModuleId != -1 && PageState.Action != "" && _moduleState.UseAdminContainer)
if (PageState.ModuleId != -1 && _moduleState.UseAdminContainer)
{
container = Constants.DefaultAdminContainer;
}

6
Oqtane.Client/UI/Pane.razor
View File

@ -39,12 +39,12 @@
DynamicComponent = builder =>
{
if (PageState.ModuleId != -1 && PageState.Action != "")
if (PageState.ModuleId != -1 && PageState.Action != Constants.DefaultAction)
{
if (Name.ToLower() == Constants.AdminPane.ToLower())
{
Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
if (module != null)
if (module != null && !module.IsDeleted)
{
var typename = module.ModuleType;
// check for core module actions component
@ -104,7 +104,7 @@
if (PageState.ModuleId != -1)
{
Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
if (module != null && module.Pane.ToLower() == Name.ToLower())
if (module != null && module.Pane.ToLower() == Name.ToLower() && !module.IsDeleted)
{
// check if user is authorized to view module
if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))