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

Merge pull request #3639 from sbwalker/dev

Browse Source 
fix #3637 - ensure ServerState Scripts only contains site level script resources
This commit is contained in:
Shaun Walker
2024-01-12 08:20:17 -05:00
committed by GitHub
parent 949ca00dbb 6f39ebf48f
commit 03433b00d2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -228,7 +228,7 @@ namespace Oqtane.Repository
// build list of scripts for site
if (moduledefinition.Resources != null)
{
foreach (var resource in moduledefinition.Resources.Where(item => item.Level == ResourceLevel.Site))
foreach (var resource in moduledefinition.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Site))
{
if (!serverState.Scripts.Contains(resource))
{

2
Oqtane.Server/Repository/ThemeRepository.cs
View File

@ -200,7 +200,7 @@ namespace Oqtane.Repository
// build list of scripts for site
if (theme.Resources != null)
{
foreach (var resource in theme.Resources.Where(item => item.Level == ResourceLevel.Site))
foreach (var resource in theme.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Site))
{
if (!serverState.Scripts.Contains(resource))
{