Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent 6f697d3f07
commit 0b7e65d98d
5 changed files with 17 additions and 17 deletions

View File

@ -1,11 +1,11 @@
[
{
"id": 1005501001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Workflows",
"uri": "{/lang}/backend/workflow/dashboard?{?}",
"uri": "{/prefix}workflow/dashboard?{?}",
"target": "self",
"icon": null,
"order": 40,
@ -15,11 +15,11 @@
"children": [
{
"id": 1005502001,
"pid": "/backend/workflow",
"pid": "/workflow",
"type": 3,
"subtype": 1,
"name": "Dashboard",
"uri": "{/lang}/backend/workflow/dashboard?{?}",
"uri": "{/prefix}workflow/dashboard?{?}",
"target": "self",
"icon": null,
"order": 1,
@ -30,11 +30,11 @@
},
{
"id": 1005503001,
"pid": "/backend/workflow",
"pid": "/workflow",
"type": 3,
"subtype": 1,
"name": "Templates",
"uri": "{/lang}/backend/workflow/template/list?{?}",
"uri": "{/prefix}workflow/template/list?{?}",
"target": "self",
"icon": null,
"order": 5,
@ -45,11 +45,11 @@
},
{
"id": 1005504001,
"pid": "/backend/workflow",
"pid": "/workflow",
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/lang}/backend/workflow/template/create?{?}",
"uri": "{/prefix}workflow/template/create?{?}",
"target": "self",
"icon": null,
"order": 10,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/backend/workflow/template/list.*$' => [
'^.*/workflow/template/list.*$' => [
[
'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplates',
'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
],
],
],
'^.*/backend/workflow/template/single.*$' => [
'^.*/workflow/template/single.*$' => [
[
'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplate',
'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
],
],
],
'^.*/backend/workflow/template/create.*$' => [
'^.*/workflow/template/create.*$' => [
[
'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplateCreate',
'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
],
],
],
'^.*/backend/workflow/dashboard.*$' => [
'^.*/workflow/dashboard.*$' => [
[
'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowDashboard',
'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
],
],
],
'^.*/backend/workflow/single.*$' => [
'^.*/workflow/single.*$' => [
[
'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowSingle',
'verb' => RouteVerb::GET,

View File

@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>
<header><h1><?= $this->getHtml('Task') ?></h1></header>
<div class="inner">
<form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/task/create'); ?>">
<form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}task/create'); ?>">
<table class="layout wf-100">
<tbody>
<tr><td colspan="2"><label for="iReceiver"><?= $this->getHtml('To') ?></label>

View File

@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
<tfoot>
<tbody>
<?php $c = 0; foreach ($workflows as $key => $workflow) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/task/single?{?}&id=' . $workflow->getId());
$url = \phpOMS\Uri\UriFactory::build('{/prefix}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'; }

View File

@ -27,7 +27,7 @@
"load": [
{
"pid": [
"/backend/workflow"
"/workflow"
],
"type": 4,
"for": 0,
@ -36,7 +36,7 @@
},
{
"pid": [
"/backend"
"/"
],
"type": 5,
"from": "Workflow",