From 17b907383f1c5ea7ac2bac424e3121d4e1ddbe67 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 8 Nov 2017 22:39:51 +0100 Subject: [PATCH] Fix #13 --- Admin/Install/Navigation.install.json | 8 ++++---- Theme/Backend/workflow-create.tpl.php | 2 +- Theme/Backend/workflow-dashboard.tpl.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index b43c079..1b2554f 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Workflows", - "uri": "{/base}/{/lang}/backend/workflow/dashboard?{?}", + "uri": "/{/lang}/backend/workflow/dashboard?{?}", "target": "self", "icon": null, "order": 40, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "{/base}/{/lang}/backend/workflow/dashboard?{?}", + "uri": "/{/lang}/backend/workflow/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Templates", - "uri": "{/base}/{/lang}/backend/workflow/template/list?{?}", + "uri": "/{/lang}/backend/workflow/template/list?{?}", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/workflow/template/create?{?}", + "uri": "/{/lang}/backend/workflow/template/create?{?}", "target": "self", "icon": null, "order": 10, diff --git a/Theme/Backend/workflow-create.tpl.php b/Theme/Backend/workflow-create.tpl.php index 8fa051a..a8b0a0d 100644 --- a/Theme/Backend/workflow-create.tpl.php +++ b/Theme/Backend/workflow-create.tpl.php @@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Task') ?>

-
+ $workflow) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $workflow->getId()); + $url = \phpOMS\Uri\UriFactory::build('/{/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'; }
diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php index b8fca04..2fd0996 100644 --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>