kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chlupac/oqtane.framework

Browse Source
This commit is contained in:
Pavel Vesely 2020-02-08 22:49:00 +01:00
commit 9eb14cac3e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Client/Shared/ModuleInstance.razor
View File

@ -39,7 +39,7 @@
if (typename != null) if (typename != null)
{ {
moduleType = Type.GetType(typename); moduleType = Type.GetType(typename);
}
if (moduleType != null) if (moduleType != null)
{ {
builder.OpenComponent(0, moduleType); builder.OpenComponent(0, moduleType);
@ -50,6 +50,12 @@
// module does not exist with typename specified // module does not exist with typename specified
message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor"; message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
} }
}
else
{
message = "Something is wrong with moduletype";
}
}; };
} }

2
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -408,7 +408,7 @@
if (module.PageId == pageid) if (module.PageId == pageid)
{ {
// ensure module's pane exists in current page and if not, assign it to the Admin pane // ensure module's pane exists in current page and if not, assign it to the Admin pane
if (!panes.ToLower().Contains(module.Pane.ToLower())) if (panes == null || !panes.ToLower().Contains(module.Pane.ToLower()))
{ {
module.Pane = Constants.AdminPane; module.Pane = Constants.AdminPane;
} }