From 7239bde84e94279d488f7b661c493fd8cd65e304 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2017 18:21:27 +0200 Subject: [PATCH] fixes #62 --- Admin/Install/Navigation.install.json | 8 ++++---- Theme/Backend/workflow-dashboard.tpl.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 7bd6452..2325361 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Workflows", - "uri": "/{/lang}/backend/workflow/dashboard?{?}", + "uri": "{/base}/{/lang}/backend/workflow/dashboard?{?}", "target": "self", "icon": null, "order": 40, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "/{/lang}/backend/workflow/dashboard?{?}", + "uri": "{/base}/{/lang}/backend/workflow/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Templates", - "uri": "/{/lang}/backend/workflow/template/list?{?}", + "uri": "{/base}/{/lang}/backend/workflow/template/list?{?}", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "/{/lang}/backend/workflow/template/create?{?}", + "uri": "{/base}/{/lang}/backend/workflow/template/create?{?}", "target": "self", "icon": null, "order": 10, diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php index d8fb436..d72269f 100644 --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?> $workflow) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/task/single?{?}&id=' . $workflow->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $workflow->getId()); $color = 'darkred'; if($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::DONE) { $color = 'green'; } elseif($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::OPEN) { $color = 'darkblue'; }