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

fixed issue where modulestate was being modified and not treated as a readonly cache

Browse Source
This commit is contained in:
Shaun Walker 2020-11-09 15:35:32 -05:00
parent a8932ec1e0
commit 07519bccde
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Themes/Controls/ModuleTitle.razor
View File

@ -1,4 +1,4 @@
@namespace Oqtane.Themes.Controls
@namespace Oqtane.Themes.Controls
@inherits ContainerBase
@attribute [OqtaneIgnore]
@ -17,6 +17,13 @@
{
title = PageState.Action;
}
else
{
if (!string.IsNullOrEmpty(ModuleState.ControlTitle))
{
title = ModuleState.ControlTitle;
}
}
return Task.CompletedTask;
}
}

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

@ -1,4 +1,4 @@
@using Microsoft.AspNetCore.Components.Rendering
@using Microsoft.AspNetCore.Components.Rendering
@namespace Oqtane.UI
@inject IUserService UserService
@inject IModuleService ModuleService
@ -53,8 +53,8 @@ else
if (module != null && !module.IsDeleted)
{
var typename = module.ModuleType;
// check for core module actions component
if (Constants.DefaultModuleActions.Contains(PageState.Action))
// check for core module actions component
if (Constants.DefaultModuleActions.Contains(PageState.Action))
{
typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, PageState.Action);
}
@ -91,17 +91,13 @@ else
if (authorized)
{
if (!Constants.DefaultModuleActions.Contains(PageState.Action) && module.ControlTitle != "")
{
module.Title = module.ControlTitle;
}
CreateComponent(builder, module);
}
}
else
{
// module control does not exist with name specified
}
// module control does not exist with name specified
}
}
}
}

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

@ -442,6 +442,12 @@
var paneindex = new Dictionary<string, int>();
foreach (Module module in modules)
{
// initialize module control properties
module.SecurityAccessLevel = SecurityAccessLevel.Host;
module.ControlTitle = "";
module.Actions = "";
module.UseAdminContainer = false;
if ((module.PageId == page.PageId || module.ModuleId == moduleid) && module.ModuleDefinition != null)
{
var typename = string.Empty;
@ -520,6 +526,7 @@
module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
// container fallback
if (string.IsNullOrEmpty(module.ContainerType))
{
module.ContainerType = defaultcontainertype;