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

Merge pull request #3972 from sbwalker/dev

Browse Source 
fix resource processing issue
This commit is contained in:
Shaun Walker 2024-03-10 09:18:28 -04:00 committed by GitHub
commit a8a3c63f64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -79,7 +79,7 @@ namespace Oqtane.Modules
{ {
if (PageState.Page.Resources != null) if (PageState.Page.Resources != null)
{ {
resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site && item.Namespace == type.Namespace).ToList(); resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Module && item.Namespace == type.Namespace).ToList();
} }
} }
else // modulecontrolbase else // modulecontrolbase

2
Oqtane.Client/Themes/ThemeBase.cs
View File

@ -45,7 +45,7 @@ namespace Oqtane.Themes
{ {
if (PageState.Page.Resources != null) if (PageState.Page.Resources != null)
{ {
resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site && item.Namespace == type.Namespace).ToList(); resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Page && item.Namespace == type.Namespace).ToList();
} }
} }
else // themecontrolbase, containerbase else // themecontrolbase, containerbase

5
Oqtane.Server/Components/App.razor
View File

@ -581,9 +581,7 @@
} }
} }
foreach (Module module in site.Modules) foreach (Module module in site.Modules.Where(item => item.PageId == page.PageId || item.ModuleId == moduleid))
{
if (module.PageId == page.PageId || module.ModuleId == moduleid)
{ {
var typename = ""; var typename = "";
if (module.ModuleDefinition != null) if (module.ModuleDefinition != null)
@ -648,7 +646,6 @@
} }
} }
} }
}
// site level resources for modules in site // site level resources for modules in site
var modules = site.Modules.GroupBy(item => item.ModuleDefinition.ModuleDefinitionName).Select(group => group.First()).ToList(); var modules = site.Modules.GroupBy(item => item.ModuleDefinition.ModuleDefinitionName).Select(group => group.First()).ToList();