Fix: #3183, Fix: #3171 - Router fails wtih optional tree parameter fo…

…r private trees
fisharebest · Apr 20, 2020 · b59ec43 · b59ec43
1 parent aadd14b
commit b59ec43
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php
@@ -544,8 +544,13 @@ public function load(Map $router): void
                 $router->get('example', '/…');
             });
 
-            $router->get('module', '/module/{module}/{action}{/tree}', ModuleAction::class)
+            // Match module routes, with and without a tree.
+            $router->get('module-tree', '/module/{module}/{action}/{tree}', ModuleAction::class)
                 ->allows(RequestMethodInterface::METHOD_POST);
+            $router->get('module-no-tree', '/module/{module}/{action}', ModuleAction::class)
+                ->allows(RequestMethodInterface::METHOD_POST);
+            // Generate module routes only. The router cannot distinguish a private tree from no tree.
+            $router->get('module', '/module/{module}/{action}{/tree}', null);
 
             $router->get(HelpText::class, '/help/{topic}', HelpText::class);
             $router->post(SelectLanguage::class, '/language/{language}', SelectLanguage::class);