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

Merge pull request #5707 from sbwalker/dev

Browse Source 
fix internal template logic so that assembly name is determined dynamically
This commit is contained in:
Shaun Walker
2025-10-13 14:43:25 -04:00
committed by GitHub
parent 4a57abc99d bc617db649
commit cc2e34fc0b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@@ -132,8 +132,9 @@ namespace Oqtane.Controllers
if (moduleDefinition.Template.ToLower().Contains("internal")) if (moduleDefinition.Template.ToLower().Contains("internal"))
{ {
rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server"; var assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", Oqtane.Client"; moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + assemblyName;
moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + assemblyName.Replace(".Server", ".Client");
} }
else else
{ {

3
Oqtane.Server/Controllers/ThemeController.cs
View File

@@ -226,7 +226,8 @@ namespace Oqtane.Controllers
if (theme.Template.ToLower().Contains("internal")) if (theme.Template.ToLower().Contains("internal"))
{ {
rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString()); 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 else
{ {