From 0ef9ea08a3dd25ce3921430dd17bc30df1efe1f1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 9 Nov 2022 22:56:19 +0100 Subject: [PATCH] permission changes & minor bug fixes --- Admin/Hooks/Cli.php | 0 Admin/Install/Media.install.json | 0 Admin/Install/Media.php | 0 Admin/Routes/Cli.php | 0 Admin/Routes/Web/Api.php | 0 Controller.js | 0 Controller/ApiController.php | 0 Controller/CliController.php | 0 .../img/workflow_execution_path.drawio.svg | 0 Docs/Help/en/SUMMARY.md | 0 Docs/Help/en/introduction.md | 0 ICAL.txt | 0 Models/NullWorkflowInstanceAbstract.php | 0 Models/NullWorkflowTemplate.php | 0 Models/WorkflowControllerInterface.php | 0 Models/WorkflowInstanceAbstract.php | 0 Models/WorkflowInstanceAbstractMapper.php | 0 Models/WorkflowInstanceStatus.php | 0 Models/WorkflowStatus.php | 0 Models/WorkflowTemplate.php | 0 Models/WorkflowTemplateMapper.php | 0 Models/WorkflowTemplateStatus.php | 0 Theme/Backend/Lang/Navigation.ar.lang.php | 0 Theme/Backend/Lang/Navigation.cs.lang.php | 0 Theme/Backend/Lang/Navigation.da.lang.php | 0 Theme/Backend/Lang/Navigation.de.lang.php | 0 Theme/Backend/Lang/Navigation.el.lang.php | 0 Theme/Backend/Lang/Navigation.en.lang.php | 0 Theme/Backend/Lang/Navigation.es.lang.php | 0 Theme/Backend/Lang/Navigation.fi.lang.php | 0 Theme/Backend/Lang/Navigation.fr.lang.php | 0 Theme/Backend/Lang/Navigation.hu.lang.php | 0 Theme/Backend/Lang/Navigation.it.lang.php | 0 Theme/Backend/Lang/Navigation.ja.lang.php | 0 Theme/Backend/Lang/Navigation.ko.lang.php | 0 Theme/Backend/Lang/Navigation.no.lang.php | 0 Theme/Backend/Lang/Navigation.pl.lang.php | 0 Theme/Backend/Lang/Navigation.pt.lang.php | 0 Theme/Backend/Lang/Navigation.ru.lang.php | 0 Theme/Backend/Lang/Navigation.sv.lang.php | 0 Theme/Backend/Lang/Navigation.th.lang.php | 0 Theme/Backend/Lang/Navigation.tr.lang.php | 0 Theme/Backend/Lang/Navigation.uk.lang.php | 0 Theme/Backend/Lang/Navigation.zh.lang.php | 0 Theme/Backend/Lang/ar.lang.php | 0 Theme/Backend/Lang/cs.lang.php | 0 Theme/Backend/Lang/da.lang.php | 0 Theme/Backend/Lang/de.lang.php | 0 Theme/Backend/Lang/el.lang.php | 0 Theme/Backend/Lang/en.lang.php | 0 Theme/Backend/Lang/es.lang.php | 0 Theme/Backend/Lang/fi.lang.php | 0 Theme/Backend/Lang/fr.lang.php | 0 Theme/Backend/Lang/hu.lang.php | 0 Theme/Backend/Lang/it.lang.php | 0 Theme/Backend/Lang/ja.lang.php | 0 Theme/Backend/Lang/ko.lang.php | 0 Theme/Backend/Lang/no.lang.php | 0 Theme/Backend/Lang/pl.lang.php | 0 Theme/Backend/Lang/pt.lang.php | 0 Theme/Backend/Lang/ru.lang.php | 0 Theme/Backend/Lang/sv.lang.php | 0 Theme/Backend/Lang/th.lang.php | 0 Theme/Backend/Lang/tr.lang.php | 0 Theme/Backend/Lang/uk.lang.php | 0 Theme/Backend/Lang/zh.lang.php | 0 Theme/Backend/workflow-dashboard.tpl.php | 2 +- Theme/Backend/workflow-instance-list.tpl.php | 2 +- Theme/Backend/workflow-template-list.tpl.php | 20 +++++++++---------- 69 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 Admin/Hooks/Cli.php mode change 100644 => 100755 Admin/Install/Media.install.json mode change 100644 => 100755 Admin/Install/Media.php mode change 100644 => 100755 Admin/Routes/Cli.php mode change 100644 => 100755 Admin/Routes/Web/Api.php mode change 100644 => 100755 Controller.js mode change 100644 => 100755 Controller/ApiController.php mode change 100644 => 100755 Controller/CliController.php mode change 100644 => 100755 Docs/Dev/img/workflow_execution_path.drawio.svg mode change 100644 => 100755 Docs/Help/en/SUMMARY.md mode change 100644 => 100755 Docs/Help/en/introduction.md mode change 100644 => 100755 ICAL.txt mode change 100644 => 100755 Models/NullWorkflowInstanceAbstract.php mode change 100644 => 100755 Models/NullWorkflowTemplate.php mode change 100644 => 100755 Models/WorkflowControllerInterface.php mode change 100644 => 100755 Models/WorkflowInstanceAbstract.php mode change 100644 => 100755 Models/WorkflowInstanceAbstractMapper.php mode change 100644 => 100755 Models/WorkflowInstanceStatus.php mode change 100644 => 100755 Models/WorkflowStatus.php mode change 100644 => 100755 Models/WorkflowTemplate.php mode change 100644 => 100755 Models/WorkflowTemplateMapper.php mode change 100644 => 100755 Models/WorkflowTemplateStatus.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.zh.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/zh.lang.php mode change 100644 => 100755 Theme/Backend/workflow-dashboard.tpl.php diff --git a/Admin/Hooks/Cli.php b/Admin/Hooks/Cli.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media.install.json b/Admin/Install/Media.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php old mode 100644 new mode 100755 diff --git a/Admin/Routes/Cli.php b/Admin/Routes/Cli.php old mode 100644 new mode 100755 diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php old mode 100644 new mode 100755 diff --git a/Controller.js b/Controller.js old mode 100644 new mode 100755 diff --git a/Controller/ApiController.php b/Controller/ApiController.php old mode 100644 new mode 100755 diff --git a/Controller/CliController.php b/Controller/CliController.php old mode 100644 new mode 100755 diff --git a/Docs/Dev/img/workflow_execution_path.drawio.svg b/Docs/Dev/img/workflow_execution_path.drawio.svg old mode 100644 new mode 100755 diff --git a/Docs/Help/en/SUMMARY.md b/Docs/Help/en/SUMMARY.md old mode 100644 new mode 100755 diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md old mode 100644 new mode 100755 diff --git a/ICAL.txt b/ICAL.txt old mode 100644 new mode 100755 diff --git a/Models/NullWorkflowInstanceAbstract.php b/Models/NullWorkflowInstanceAbstract.php old mode 100644 new mode 100755 diff --git a/Models/NullWorkflowTemplate.php b/Models/NullWorkflowTemplate.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowControllerInterface.php b/Models/WorkflowControllerInterface.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowInstanceAbstract.php b/Models/WorkflowInstanceAbstract.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowInstanceAbstractMapper.php b/Models/WorkflowInstanceAbstractMapper.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowInstanceStatus.php b/Models/WorkflowInstanceStatus.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowStatus.php b/Models/WorkflowStatus.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowTemplate.php b/Models/WorkflowTemplate.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowTemplateMapper.php b/Models/WorkflowTemplateMapper.php old mode 100644 new mode 100755 diff --git a/Models/WorkflowTemplateStatus.php b/Models/WorkflowTemplateStatus.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php old mode 100644 new mode 100755 index 0b3ad15..597986a --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?> $instance) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/instance/single?{?}&id=' . $instance->getId()); + $url = \phpOMS\Uri\UriFactory::build('admin/instance/single?{?}&id=' . $instance->getId()); ?> printHtml((string) $instance->getStatus()); ?> diff --git a/Theme/Backend/workflow-instance-list.tpl.php b/Theme/Backend/workflow-instance-list.tpl.php index 3ea3d6a..f03dd02 100755 --- a/Theme/Backend/workflow-instance-list.tpl.php +++ b/Theme/Backend/workflow-instance-list.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?> $instance) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}workflow/instance/profile?{?}&id=' . $instance->getId()); + $url = \phpOMS\Uri\UriFactory::build('workflow/instance/profile?{?}&id=' . $instance->getId()); ?> printHtml((string) $instance->getStatus()); ?> diff --git a/Theme/Backend/workflow-template-list.tpl.php b/Theme/Backend/workflow-template-list.tpl.php index 16d382f..ae5205c 100755 --- a/Theme/Backend/workflow-template-list.tpl.php +++ b/Theme/Backend/workflow-template-list.tpl.php @@ -29,16 +29,16 @@ $accountDir = $account->getId() . ' ' . $account->login; $collections = $this->getData('collections'); $mediaPath = \urldecode($this->getData('path') ?? '/'); -$previous = empty($templates) ? '{/prefix}workflow/template/list' : '{/prefix}workflow/template/list?{?}&id=' . \reset($templates)->getId() . '&ptype=p'; -$next = empty($templates) ? '{/prefix}workflow/template/list' : '{/prefix}workflow/template/list?{?}&id=' . \end($templates)->getId() . '&ptype=n'; +$previous = empty($templates) ? 'workflow/template/list' : 'workflow/template/list?{?}&id=' . \reset($templates)->getId() . '&ptype=p'; +$next = empty($templates) ? 'workflow/template/list' : 'workflow/template/list?{?}&id=' . \end($templates)->getId() . '&ptype=n'; echo $this->getData('nav')->render(); ?>