diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 403652c..05ae75b 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Units", - "uri": "{/base}/{/lang}/backend/organization/unit/list?{?}", + "uri": "/{/lang}/backend/organization/unit/list?{?}", "target": "self", "icon": null, "order": 1, @@ -33,7 +33,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/organization/unit/list?{?}", + "uri": "/{/lang}/backend/organization/unit/list?{?}", "target": "self", "icon": null, "order": 5, @@ -48,7 +48,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/organization/unit/create?{?}", + "uri": "/{/lang}/backend/organization/unit/create?{?}", "target": "self", "icon": null, "order": 25, @@ -65,7 +65,7 @@ "type": 2, "subtype": 1, "name": "Departments", - "uri": "{/base}/{/lang}/backend/organization/department/list?{?}", + "uri": "/{/lang}/backend/organization/department/list?{?}", "target": "self", "icon": null, "order": 5, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/organization/department/list?{?}", + "uri": "/{/lang}/backend/organization/department/list?{?}", "target": "self", "icon": null, "order": 5, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/organization/department/create?{?}", + "uri": "/{/lang}/backend/organization/department/create?{?}", "target": "self", "icon": null, "order": 25, @@ -111,7 +111,7 @@ "type": 2, "subtype": 1, "name": "Positions", - "uri": "{/base}/{/lang}/backend/organization/position/list?{?}", + "uri": "/{/lang}/backend/organization/position/list?{?}", "target": "self", "icon": null, "order": 20, @@ -125,7 +125,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/organization/position/list?{?}", + "uri": "/{/lang}/backend/organization/position/list?{?}", "target": "self", "icon": null, "order": 5, @@ -140,7 +140,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/organization/position/create?{?}", + "uri": "/{/lang}/backend/organization/position/create?{?}", "target": "self", "icon": null, "order": 25, diff --git a/Theme/Backend/department-create.tpl.php b/Theme/Backend/department-create.tpl.php index 6fd9ea1..29f0e51 100644 --- a/Theme/Backend/department-create.tpl.php +++ b/Theme/Backend/department-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Department') ?>

-
+ getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/organization/department/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/organization/department/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 5793bba..1f822d1 100644 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/position-create.tpl.php b/Theme/Backend/position-create.tpl.php index 15c4743..2fd0a3d 100644 --- a/Theme/Backend/position-create.tpl.php +++ b/Theme/Backend/position-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Position') ?>

- + $value) : $count++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/organization/position/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/organization/position/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php index 6170b57..65b63b0 100644 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php index f4534e7..46f9e17 100644 --- a/Theme/Backend/unit-create.tpl.php +++ b/Theme/Backend/unit-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Unit') ?>

- + getData('list:elements') as $key => $value) : - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/organization/unit/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/organization/unit/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 70aaa12..d433f1c 100644 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?>