From 6f39ebf48f75da73ef747526278a7c6d1bb83178 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 12 Jan 2024 08:19:58 -0500 Subject: [PATCH] fix #3637 - ensure ServerState Scripts only contains site level script resources --- Oqtane.Server/Repository/ModuleDefinitionRepository.cs | 2 +- Oqtane.Server/Repository/ThemeRepository.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 935525ee..075646e4 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -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)) { diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index a650f7d3..86d14d86 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -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)) {