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

Merge pull request #556 from iJungleboy/patches/fix544

Browse Source 
Patches/fix544
This commit is contained in:
Shaun Walker 2020-05-29 08:38:22 -04:00 committed by GitHub
commit ee3a4d1624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,16 +54,26 @@ namespace Oqtane.Repository
) continue; ) continue;
string themeNamespace = themeControlType.Namespace; string themeNamespace = themeControlType.Namespace;
string qualifiedModuleType = themeNamespace + ", " + themeControlType.Assembly.GetName().Name; // 2dm disabled - not used anywhere in code
//string qualifiedModuleType = themeNamespace + ", " + themeControlType.Assembly.GetName().Name;
int index = themes.FindIndex(item => item.ThemeName == themeNamespace); int index = themes.FindIndex(item => item.ThemeName == themeNamespace);
// Find all types in the assembly which have the same namespace-root as the theme file
// Check with "." in the end to
List<Type> typesInTheme = assembly.GetTypes()
.Where(item => item.Namespace != null)
// Namespace must be the same or start with "xxx." to ensure that
// similar namespaces like "MyTheme" and "MyTheme2" don't match in StartsWith(...)
.Where(item => item.Namespace == themeNamespace
|| item.Namespace.StartsWith(themeNamespace + "."))
.ToList();
if (index == -1) if (index == -1)
{ {
// determine if this theme implements ITheme // determine if this theme implements ITheme
Type themetype = assembly.GetTypes() Type themetype = typesInTheme
.Where(item => item.Namespace != null) .FirstOrDefault(item => item.GetInterfaces().Contains(typeof(ITheme)));
.Where(item => item.Namespace.StartsWith(themeNamespace))
.Where(item => item.GetInterfaces().Contains(typeof(ITheme))).FirstOrDefault();
if (themetype != null) if (themetype != null)
{ {
var themeobject = Activator.CreateInstance(themetype) as ITheme; var themeobject = Activator.CreateInstance(themetype) as ITheme;
@ -90,9 +100,7 @@ namespace Oqtane.Repository
theme.ThemeControls += (themeControlType.FullName + ", " + themeControlType.Assembly.GetName().Name + ";"); theme.ThemeControls += (themeControlType.FullName + ", " + themeControlType.Assembly.GetName().Name + ";");
// layouts // layouts
Type[] layouttypes = assembly.GetTypes() Type[] layouttypes = typesInTheme
.Where(item => item.Namespace != null)
.Where(item => item.Namespace.StartsWith(themeNamespace))
.Where(item => item.GetInterfaces().Contains(typeof(ILayoutControl))).ToArray(); .Where(item => item.GetInterfaces().Contains(typeof(ILayoutControl))).ToArray();
foreach (Type layouttype in layouttypes) foreach (Type layouttype in layouttypes)
{ {
@ -104,9 +112,7 @@ namespace Oqtane.Repository
} }
// containers // containers
Type[] containertypes = assembly.GetTypes() Type[] containertypes = typesInTheme
.Where(item => item.Namespace != null)
.Where(item => item.Namespace.StartsWith(themeNamespace))
.Where(item => item.GetInterfaces().Contains(typeof(IContainerControl))).ToArray(); .Where(item => item.GetInterfaces().Contains(typeof(IContainerControl))).ToArray();
foreach (Type containertype in containertypes) foreach (Type containertype in containertypes)
{ {