permission changes & minor bug fixes

This commit is contained in:
Dennis Eichhorn 2022-11-09 22:56:19 +01:00
parent e0f63d6e4b
commit 0ef9ea08a3
69 changed files with 12 additions and 12 deletions

0
Admin/Hooks/Cli.php Normal file → Executable file
View File

0
Admin/Install/Media.install.json Normal file → Executable file
View File

0
Admin/Install/Media.php Normal file → Executable file
View File

0
Admin/Routes/Cli.php Normal file → Executable file
View File

0
Admin/Routes/Web/Api.php Normal file → Executable file
View File

0
Controller.js Normal file → Executable file
View File

0
Controller/ApiController.php Normal file → Executable file
View File

0
Controller/CliController.php Normal file → Executable file
View File

0
Docs/Dev/img/workflow_execution_path.drawio.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
Docs/Help/en/SUMMARY.md Normal file → Executable file
View File

0
Docs/Help/en/introduction.md Normal file → Executable file
View File

0
ICAL.txt Normal file → Executable file
View File

0
Models/NullWorkflowInstanceAbstract.php Normal file → Executable file
View File

0
Models/NullWorkflowTemplate.php Normal file → Executable file
View File

0
Models/WorkflowControllerInterface.php Normal file → Executable file
View File

0
Models/WorkflowInstanceAbstract.php Normal file → Executable file
View File

0
Models/WorkflowInstanceAbstractMapper.php Normal file → Executable file
View File

0
Models/WorkflowInstanceStatus.php Normal file → Executable file
View File

0
Models/WorkflowStatus.php Normal file → Executable file
View File

0
Models/WorkflowTemplate.php Normal file → Executable file
View File

0
Models/WorkflowTemplateMapper.php Normal file → Executable file
View File

0
Models/WorkflowTemplateStatus.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ar.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.cs.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.da.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.de.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.el.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.en.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.es.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.fi.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.fr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.hu.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.it.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ja.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ko.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.no.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.pl.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.pt.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ru.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.sv.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.th.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.tr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.uk.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.zh.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ar.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/cs.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/da.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/de.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/el.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/en.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/es.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/fi.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/fr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/hu.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/it.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ja.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ko.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/no.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/pl.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/pt.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ru.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/sv.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/th.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/tr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/uk.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/zh.lang.php Normal file → Executable file
View File

2
Theme/Backend/workflow-dashboard.tpl.php Normal file → Executable file
View File

@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
<?php
$c = 0;
foreach ($instances as $key => $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());
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $this->printHtml((string) $instance->getStatus()); ?></a>

View File

@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
<?php
$c = 0;
foreach ($instances as $key => $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());
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $this->printHtml((string) $instance->getStatus()); ?></a>

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12">
<div class="box">
<ul class="crumbs-2">
<li data-href="<?= UriFactory::build('{/prefix}workflow/template/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/prefix}workflow/template/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
<li data-href="<?= UriFactory::build('{/prefix}workflow/template/list?path=/'); ?>"><a href="<?= UriFactory::build('{/prefix}workflow/template/list?path=/'); ?>">/</a></li>
<li data-href="<?= UriFactory::build('workflow/template/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('workflow/template/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
<li data-href="<?= UriFactory::build('workflow/template/list?path=/'); ?>"><a href="<?= UriFactory::build('workflow/template/list?path=/'); ?>">/</a></li>
<?php
$subPath = '';
$paths = \explode('/', \ltrim($mediaPath, '/'));
@ -56,7 +56,7 @@ echo $this->getData('nav')->render(); ?>
$subPath .= '/' . $paths[$i];
$url = UriFactory::build('{/prefix}workflow/template/list?path=' . $subPath);
$url = UriFactory::build('workflow/template/list?path=' . $subPath);
?>
<li data-href="<?= $url; ?>"<?= $i === $length - 1 ? 'class="active"' : ''; ?>><a href="<?= $url; ?>"><?= $this->printHtml($paths[$i]); ?></a></li>
<?php endfor; ?>
@ -115,7 +115,7 @@ echo $this->getData('nav')->render(); ?>
<i class="filter fa fa-filter"></i>
</label>
<tbody>
<?php if (!empty($parentPath)) : $url = UriFactory::build('{/prefix}workflow/template/list?path=' . $parentPath); ?>
<?php if (!empty($parentPath)) : $url = UriFactory::build('workflow/template/list?path=' . $parentPath); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td>
<td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
@ -126,7 +126,7 @@ echo $this->getData('nav')->render(); ?>
<td>
<?php endif; ?>
<?php $count = 0; foreach ($collections as $key => $value) : ++$count;
$url = UriFactory::build('{/prefix}workflow/template/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name);
$url = UriFactory::build('workflow/template/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name);
?>
<tr data-href="<?= $url; ?>">
<td><label class="checkbox" for="workflowTemplateList-<?= $key; ?>">
@ -135,11 +135,11 @@ echo $this->getData('nav')->render(); ?>
</label>
<td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td><a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
<td><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
<?php endforeach; ?>
<?php foreach ($templates as $key => $template) : ++$count;
$url = UriFactory::build('{/prefix}workflow/template/profile?{?}&id=' . $template->getId()); ?>
$url = UriFactory::build('workflow/template/profile?{?}&id=' . $template->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><label class="checkbox" for="workflowTemplateList-<?= $key; ?>">
<input type="checkbox" id="workflowTemplateList-<?= $key; ?>" name="templateselect">
@ -147,7 +147,7 @@ echo $this->getData('nav')->render(); ?>
</label>
<td>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($template->name); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $template->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$template->createdBy->name1, $template->createdBy->name2, $template->createdBy->name3, $template->createdBy->login ?? ''])); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>"><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $template->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$template->createdBy->name1, $template->createdBy->name2, $template->createdBy->name3, $template->createdBy->login ?? ''])); ?></a>
<td data-label="<?= $this->getHtml('Updated'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($template->createdAt->format('Y-m-d')); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>