From 6d520036b2c63a047121d67103e6d934ccbccfad 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 e73c117..7da0567 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1006301001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "TimeRecording", - "uri": "{/lang}/backend/hr/timerecording/dashboard?{?}", + "uri": "{/prefix}hr/timerecording/dashboard?{?}", "target": "self", "icon": null, "order": 70, @@ -15,11 +15,11 @@ "children": [ { "id": 1006302001, - "pid": "/backend/hr/timerecording", + "pid": "/hr/timerecording", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/hr/timerecording/dashboard?{?}", + "uri": "{/prefix}hr/timerecording/dashboard?{?}", "target": "self", "icon": null, "order": 1, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index d38c91d..07eed8c 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/hr/timerecording/dashboard.*$' => [ + '^.*/hr/timerecording/dashboard.*$' => [ [ 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard', 'verb' => RouteVerb::GET, diff --git a/info.json b/info.json index b9cf4e8..9e8c072 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/database" + "/database" ], "type": 4, "for": "Content", @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "HumanResourceTimeRecording",