From c9590247eb4330f524e8469c40016bee100485d2 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 14 Nov 2025 13:23:55 -0500 Subject: [PATCH] resolve naming issue for module/theme created from internal template --- Oqtane.Server/Controllers/ModuleDefinitionController.cs | 6 ++---- Oqtane.Server/Controllers/ThemeController.cs | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 29195bbe..139da8e2 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Net; @@ -133,9 +132,8 @@ namespace Oqtane.Controllers if (moduleDefinition.Template.ToLower().Contains("internal")) { rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); - var assemblyName = Assembly.GetExecutingAssembly().GetName().Name; - moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + assemblyName; - moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + assemblyName.Replace(".Server", ".Client"); + moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + ".Server.Oqtane"; + moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + moduleDefinition.Owner + ".Client.Oqtane"; } else { diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index 335a939c..3f025b40 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -227,8 +227,7 @@ namespace Oqtane.Controllers if (theme.Template.ToLower().Contains("internal")) { rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); - var assemblyName = Assembly.GetExecutingAssembly().GetName().Name; - theme.ThemeName = theme.ThemeName + ", " + assemblyName.Replace(".Server", ".Client"); + theme.ThemeName = theme.ThemeName + ", " + theme.Owner + ".Client.Oqtane"; } else {