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

Merge pull request #770 from PoisnFang/flexible-index-page-in-custom-modules

Browse Source 
Allows page to find Custom Index page in Module from Actions Property
This commit is contained in:
Shaun Walker 2020-10-03 15:14:18 -04:00 committed by GitHub
commit e934a28c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Oqtane.Client/UI/SiteRouter.razor
View File

@ -76,7 +76,7 @@
User user = null; User user = null;
List<Module> modules; List<Module> modules;
var moduleid = -1; var moduleid = -1;
var action = string.Empty; var action = Constants.DefaultAction;
var urlparameters = string.Empty; var urlparameters = string.Empty;
var editmode = false; var editmode = false;
var reload = Reload.None; var reload = Reload.None;
@ -202,6 +202,7 @@
{ {
modIdPos = i + 1; modIdPos = i + 1;
actionPos = modIdPos + 1; actionPos = modIdPos + 1;
// Route to index page if no action is specifed
if (actionPos > segments.Length - 1) if (actionPos > segments.Length - 1)
{ {
action = Constants.DefaultAction; action = Constants.DefaultAction;
@ -459,25 +460,18 @@
typename = Constants.ErrorModule; typename = Constants.ErrorModule;
} }
if (module.ModuleId == moduleid && action != "") // check if the module defines custom routes*@
if (module.ModuleDefinition.ControlTypeRoutes != "")
{ {
// check if the module defines custom routes foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
if (module.ModuleDefinition.ControlTypeRoutes != "")
{ {
foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) if (route.StartsWith(action + "="))
{ {
if (route.StartsWith(action + "=")) typename = route.Replace(action + "=", "");
{
typename = route.Replace(action + "=", "");
}
} }
} }
module.ModuleType = typename.Replace(Constants.ActionToken, action);
}
else
{
module.ModuleType = typename.Replace(Constants.ActionToken, Constants.DefaultAction);
} }
module.ModuleType = typename.Replace(Constants.ActionToken, action);
// get additional metadata from IModuleControl interface // get additional metadata from IModuleControl interface
typename = module.ModuleType; typename = module.ModuleType;