From c243bffde95265d5db1a15654a22e42cc763ffb0 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 | 6 +++--- Admin/Routes/Web/Backend.php | 12 ++++++------ info.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 6ff81d8..9467d31 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,7 +1,7 @@ [ { "id": 1002101001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 0, "name": "Purchase", @@ -15,11 +15,11 @@ "children": [ { "id": 1002106001, - "pid": "/backend/purchase", + "pid": "/purchase", "type": 2, "subtype": 1, "name": "Analysis", - "uri": "{/lang}/backend/purchase/analysis?{?}", + "uri": "{/prefix}purchase/analysis?{?}", "target": "self", "icon": null, "order": 15, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 8e328cc..546388c 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/invoice/create.*$' => [ + '^.*/purchase/invoice/create.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseInvoiceCreate', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/purchase/invoice/list.*$' => [ + '^.*/purchase/invoice/list.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseInvoiceList', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/purchase/article/list.*$' => [ + '^.*/purchase/article/list.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseArticleList', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/purchase/article/recommend.*$' => [ + '^.*/purchase/article/recommend.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseOrderRecommendation', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/purchase/article/create.*$' => [ + '^.*/purchase/article/create.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseArticleCreate', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '^.*/backend/purchase/article/profile.*$' => [ + '^.*/purchase/article/profile.*$' => [ [ 'dest' => '\Modules\Purchase\Controller\BackendController:viewPurchaseArticleProfile', 'verb' => RouteVerb::GET, diff --git a/info.json b/info.json index ef5b70f..84052ef 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/purchase" + "/purchase" ], "type": 4, "for": 0, @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Purchase",