From bc617db649e80a4420fe2a42af38122ded9bca90 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Mon, 13 Oct 2025 14:42:53 -0400 Subject: [PATCH] fix internal template logic so that assembly name is determined dynamically --- Oqtane.Server/Controllers/ModuleDefinitionController.cs | 5 +++-- Oqtane.Server/Controllers/ThemeController.cs | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 8b04ad20..df876829 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -132,8 +132,9 @@ namespace Oqtane.Controllers if (moduleDefinition.Template.ToLower().Contains("internal")) { rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); - moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; - moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", Oqtane.Client"; + var assemblyName = Assembly.GetExecutingAssembly().GetName().Name; + moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + assemblyName; + moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + assemblyName.Replace(".Server", ".Client"); } else { diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index b2cc657f..0463ae34 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -226,7 +226,8 @@ namespace Oqtane.Controllers if (theme.Template.ToLower().Contains("internal")) { rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); - theme.ThemeName = theme.ThemeName + ", Oqtane.Client"; + var assemblyName = Assembly.GetExecutingAssembly().GetName().Name; + theme.ThemeName = theme.ThemeName + ", " + assemblyName.Replace(".Server", ".Client"); } else {