From bff5d56f92d602b165a7c1ce0487eda4d7edae6c 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 | 12 ++++++------ Admin/Routes/Web/Backend.php | 8 ++++---- info.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index c19572c..da92227 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1003202001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Suppliers", - "uri": "{/lang}/backend/purchase/supplier/list?{?}", + "uri": "{/prefix}purchase/supplier/list?{?}", "target": "self", "icon": null, "order": 1, @@ -15,11 +15,11 @@ "children": [ { "id": 1003202101, - "pid": "/backend/purchase/supplier", + "pid": "/purchase/supplier", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/purchase/supplier/list?{?}", + "uri": "{/prefix}purchase/supplier/list?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1003202201, - "pid": "/backend/purchase/supplier", + "pid": "/purchase/supplier", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/purchase/supplier/create?{?}", + "uri": "{/prefix}purchase/supplier/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e33cb3d..8b8ad43 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/purchase/supplier/list.*$' => [ + '^.*/purchase/supplier/list.*$' => [ [ 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/purchase/supplier/create.*$' => [ + '^.*/purchase/supplier/create.*$' => [ [ 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierCreate', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/purchase/supplier/profile.*$' => [ + '^.*/purchase/supplier/profile.*$' => [ [ 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierProfile', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/purchase/supplier/analysis.*$' => [ + '^.*/purchase/supplier/analysis.*$' => [ [ 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierAnalysis', 'verb' => RouteVerb::GET, diff --git a/info.json b/info.json index e81bfa6..462c2b3 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/purchase/supplier" + "/purchase/supplier" ], "type": 4, "for": 0, @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "SupplierManagement",