diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index d1e3314..f02e98f 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,7 +1,7 @@ [ { "id": 1002201001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 0, "name": "RnD", @@ -15,11 +15,11 @@ "children": [ { "id": 1002202001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Projects", - "uri": "{/lang}/backend/rnd/list?{?}", + "uri": "{/prefix}rnd/list?{?}", "target": "self", "icon": null, "order": 1, @@ -29,11 +29,11 @@ "children": [ { "id": 1002202101, - "pid": "/backend/rnd", + "pid": "/rnd", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/rnd/list?{?}", + "uri": "{/prefix}rnd/list?{?}", "target": "self", "icon": null, "order": 1, @@ -44,11 +44,11 @@ }, { "id": 1002202201, - "pid": "/backend/rnd", + "pid": "/rnd", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/rnd/create?{?}", + "uri": "{/prefix}rnd/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 6a35ffb..8f2f3ae 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/rnd/list.*$' => [ + '^.*/rnd/list.*$' => [ [ 'dest' => '\Modules\ResearchDevelopment\Controller\BackendController:viewProjectList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/rnd/create.*$' => [ + '^.*/rnd/create.*$' => [ [ 'dest' => '\Modules\ResearchDevelopment\Controller\BackendController:viewProjectCreate', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/rnd-list.tpl.php b/Theme/Backend/rnd-list.tpl.php index 42b557a..79110d9 100644 --- a/Theme/Backend/rnd-list.tpl.php +++ b/Theme/Backend/rnd-list.tpl.php @@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/checklist/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}checklist/single?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/info.json b/info.json index 37a90ae..379fe52 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/rnd" + "/rnd" ], "type": 4, "for": 0, @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "ResearchDevelopment",