From 44f6fab161b6a023239cd16ddad479c0e707b23a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 9 Mar 2019 23:21:29 +0100 Subject: [PATCH] Make app,localization in url optional+tld+subdomain --- Admin/Install/Navigation.install.json | 8 ++++---- Admin/Routes/Web/Backend.php | 2 +- info.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 92005aa..ff71b26 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1006401001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "P&L", - "uri": "{/lang}/backend/controlling/pl/dashboard?{?}", + "uri": "{/prefix}controlling/pl/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -15,11 +15,11 @@ "children": [ { "id": 1006402001, - "pid": "/backend/controlling/pl", + "pid": "/controlling/pl", "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "{/lang}/backend/controlling/pl/dashboard?{?}", + "uri": "{/prefix}controlling/pl/dashboard?{?}", "target": "self", "icon": null, "order": 1, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 9796d0a..a25ca3d 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/backend/controlling/pl/dashboard.*$' => [ + '^.*/controlling/pl/dashboard.*$' => [ [ 'dest' => '\Modules\PL\Controller\BackendController:viewPLDashboard', 'verb' => RouteVerb::GET, diff --git a/info.json b/info.json index 758c572..55c8c20 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/controlling/pl" + "/controlling/pl" ], "type": 4, "for": 0, @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "PL",