mirror of
https://github.com/Karaka-Management/oms-Organization.git
synced 2026-01-30 08:28:40 +00:00
Make app,localization in url optional+tld+subdomain
This commit is contained in:
parent
dd929e80f4
commit
fb718d5f32
|
|
@ -1,7 +1,7 @@
|
|||
[
|
||||
{
|
||||
"id": 1004701001,
|
||||
"pid": "/backend",
|
||||
"pid": "/",
|
||||
"type": 2,
|
||||
"subtype": 0,
|
||||
"name": "Organization",
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
"children": [
|
||||
{
|
||||
"id": 1004702001,
|
||||
"pid": "/backend",
|
||||
"pid": "/",
|
||||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Units",
|
||||
"uri": "{/lang}/backend/organization/unit/list?{?}",
|
||||
"uri": "{/prefix}organization/unit/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 1,
|
||||
|
|
@ -29,11 +29,11 @@
|
|||
"children": [
|
||||
{
|
||||
"id": 1004702101,
|
||||
"pid": "/backend/organization/unit",
|
||||
"pid": "/organization/unit",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/lang}/backend/organization/unit/list?{?}",
|
||||
"uri": "{/prefix}organization/unit/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 5,
|
||||
|
|
@ -44,11 +44,11 @@
|
|||
},
|
||||
{
|
||||
"id": 1004702102,
|
||||
"pid": "/backend/organization/unit",
|
||||
"pid": "/organization/unit",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "Create",
|
||||
"uri": "{/lang}/backend/organization/unit/create?{?}",
|
||||
"uri": "{/prefix}organization/unit/create?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 25,
|
||||
|
|
@ -61,11 +61,11 @@
|
|||
},
|
||||
{
|
||||
"id": 1004703001,
|
||||
"pid": "/backend",
|
||||
"pid": "/",
|
||||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Departments",
|
||||
"uri": "{/lang}/backend/organization/department/list?{?}",
|
||||
"uri": "{/prefix}organization/department/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 5,
|
||||
|
|
@ -75,11 +75,11 @@
|
|||
"children": [
|
||||
{
|
||||
"id": 1004703101,
|
||||
"pid": "/backend/organization/department",
|
||||
"pid": "/organization/department",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/lang}/backend/organization/department/list?{?}",
|
||||
"uri": "{/prefix}organization/department/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 5,
|
||||
|
|
@ -90,11 +90,11 @@
|
|||
},
|
||||
{
|
||||
"id": 1004703102,
|
||||
"pid": "/backend/organization/department",
|
||||
"pid": "/organization/department",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "Create",
|
||||
"uri": "{/lang}/backend/organization/department/create?{?}",
|
||||
"uri": "{/prefix}organization/department/create?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 25,
|
||||
|
|
@ -107,11 +107,11 @@
|
|||
},
|
||||
{
|
||||
"id": 1004704001,
|
||||
"pid": "/backend",
|
||||
"pid": "/",
|
||||
"type": 2,
|
||||
"subtype": 1,
|
||||
"name": "Positions",
|
||||
"uri": "{/lang}/backend/organization/position/list?{?}",
|
||||
"uri": "{/prefix}organization/position/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 20,
|
||||
|
|
@ -121,11 +121,11 @@
|
|||
"children": [
|
||||
{
|
||||
"id": 1004704101,
|
||||
"pid": "/backend/organization/position",
|
||||
"pid": "/organization/position",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "List",
|
||||
"uri": "{/lang}/backend/organization/position/list?{?}",
|
||||
"uri": "{/prefix}organization/position/list?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 5,
|
||||
|
|
@ -136,11 +136,11 @@
|
|||
},
|
||||
{
|
||||
"id": 1004704102,
|
||||
"pid": "/backend/organization/position",
|
||||
"pid": "/organization/position",
|
||||
"type": 3,
|
||||
"subtype": 1,
|
||||
"name": "Create",
|
||||
"uri": "{/lang}/backend/organization/position/create?{?}",
|
||||
"uri": "{/prefix}organization/position/create?{?}",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 25,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
|
|||
use phpOMS\Router\RouteVerb;
|
||||
|
||||
return [
|
||||
'^.*/api/organization/position.*$' => [
|
||||
'^.*/organization/position.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate',
|
||||
'verb' => RouteVerb::PUT,
|
||||
|
|
@ -44,7 +44,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/api/organization/department.*$' => [
|
||||
'^.*/organization/department.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate',
|
||||
'verb' => RouteVerb::PUT,
|
||||
|
|
@ -82,7 +82,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/api/organization/unit.*$' => [
|
||||
'^.*/organization/unit.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate',
|
||||
'verb' => RouteVerb::PUT,
|
||||
|
|
@ -121,7 +121,7 @@ return [
|
|||
],
|
||||
],
|
||||
|
||||
'^.*/api/organization/find/unit.*$' => [
|
||||
'^.*/organization/find/unit.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -132,7 +132,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/api/organization/find/department.*$' => [
|
||||
'^.*/organization/find/department.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -143,7 +143,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/api/organization/find/position.*$' => [
|
||||
'^.*/organization/find/position.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
|
|||
use phpOMS\Router\RouteVerb;
|
||||
|
||||
return [
|
||||
'^.*/backend/organization/unit/list.*$' => [
|
||||
'^.*/organization/unit/list.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -17,7 +17,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/unit/profile.*$' => [
|
||||
'^.*/organization/unit/profile.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -28,7 +28,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/unit/create.*$' => [
|
||||
'^.*/organization/unit/create.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -39,7 +39,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/department/list.*$' => [
|
||||
'^.*/organization/department/list.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -50,7 +50,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/department/profile.*$' => [
|
||||
'^.*/organization/department/profile.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -61,7 +61,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/department/create.*$' => [
|
||||
'^.*/organization/department/create.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -72,7 +72,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/position/list.*$' => [
|
||||
'^.*/organization/position/list.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -83,7 +83,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/position/profile.*$' => [
|
||||
'^.*/organization/position/profile.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
@ -94,7 +94,7 @@ return [
|
|||
],
|
||||
],
|
||||
],
|
||||
'^.*/backend/organization/position/create.*$' => [
|
||||
'^.*/organization/position/create.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate',
|
||||
'verb' => RouteVerb::GET,
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
{
|
||||
"key": 1, "listener": "click", "action": [
|
||||
{"key": 1, "type": "dom.popup", "selector": "#org-department-selector-tpl", "aniIn": "fadeIn", "id": "<?= $this->printHtml($this->getId()); ?>"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/department?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/department?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/department?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/department?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
{
|
||||
"key": 1, "listener": "click", "action": [
|
||||
{"key": 1, "type": "dom.popup", "selector": "#org-position-selector-tpl", "aniIn": "fadeIn", "id": "<?= $this->printHtml($this->getId()); ?>"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/position?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/position?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/position?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/position?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
{
|
||||
"key": 1, "listener": "click", "action": [
|
||||
{"key": 1, "type": "dom.popup", "selector": "#org-unit-selector-tpl", "aniIn": "fadeIn", "id": "<?= $this->printHtml($this->getId()); ?>"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/unit?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/unit?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/unit?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}organization/unit?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
|
||||
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Department') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="fDepartmentCreate" method="PUT" action="<?= \phpOMS\Uri\UriFactory::build('{/rootPath}{/lang}/api/organization/department'); ?>">
|
||||
<form id="fDepartmentCreate" method="PUT" action="<?= \phpOMS\Uri\UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/department'); ?>">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" placeholder=" R&D" required>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<tr><td colspan="4">
|
||||
<tbody>
|
||||
<?php $c = 0; foreach ($this->getData('list:elements') as $key => $value) : $c++;
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/organization/department/profile?{?}&id=' . $value->getId()); ?>
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->getId()); ?>
|
||||
<tr data-href="<?= $url; ?>">
|
||||
<td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
|
||||
<td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Department') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="iDepartment" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/department?{?}') ?>" method="POST">
|
||||
<form id="iDepartment" action="<?= \phpOMS\Uri\UriFactory::build('{/api}organization/department?{?}') ?>" method="POST">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" value="<?= $this->printHtml($department->getName()); ?>">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Position') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="fPositionCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/rootPath}{/lang}/api/organization/position'); ?>">
|
||||
<form id="fPositionCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}{/rootPath}{/lang}/api/organization/position'); ?>">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" placeholder=" Orange Management" required>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<tr><td colspan="3">
|
||||
<tbody>
|
||||
<?php $count = 0; foreach ($listElements as $key => $value) : ++$count;
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/organization/position/profile?{?}&id=' . $value->getId()); ?>
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/position/profile?{?}&id=' . $value->getId()); ?>
|
||||
<tr data-href="<?= $url; ?>">
|
||||
<td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
|
||||
<td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Position') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="iPosition" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/position?{?}') ?>" method="POST">
|
||||
<form id="iPosition" action="<?= \phpOMS\Uri\UriFactory::build('{/api}organization/position?{?}') ?>" method="POST">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" value="<?= $this->printHtml($position->getName()); ?>">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Unit') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="fUnitCreate" method="put" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/unit'); ?>">
|
||||
<form id="fUnitCreate" method="put" action="<?= \phpOMS\Uri\UriFactory::build('{/api}organization/unit'); ?>">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" placeholder=" Orange Management" required>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<tr><td colspan="3">
|
||||
<tbody>
|
||||
<?php foreach ($this->getData('list:elements') as $key => $value) :
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/organization/unit/profile?{?}&id=' . $value->getId()); ?>
|
||||
$url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/unit/profile?{?}&id=' . $value->getId()); ?>
|
||||
<tr data-href="<?= $url; ?>">
|
||||
<td data-label="<?= $this->getHtml('ID', 0, 0); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
|
||||
<td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box wf-100">
|
||||
<header><h1><?= $this->getHtml('Unit') ?></h1></header>
|
||||
<div class="inner">
|
||||
<form id="iUnit" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/organization/unit') ?>" method="post">
|
||||
<form id="iUnit" action="<?= \phpOMS\Uri\UriFactory::build('{/api}organization/unit') ?>" method="post">
|
||||
<table class="layout wf-100" style="table-layout: fixed">
|
||||
<tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
|
||||
<tr><td><input type="text" name="name" id="iName" value="<?= $this->printHtml($unit->getName()); ?>">
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user