From 690d28eff8812193af7b8052020a00a323f7e7c4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 11 Feb 2019 11:38:15 +0100 Subject: [PATCH] Fix absolute path to relative paths --- Admin/Install/Navigation.install.json | 18 +++++++++--------- .../department-selector.tpl.php | 4 ++-- .../position-selector.tpl.php | 4 ++-- .../UnitTagSelector/unit-selector.tpl.php | 4 ++-- Theme/Backend/department-list.tpl.php | 2 +- Theme/Backend/department-profile.tpl.php | 2 +- Theme/Backend/position-list.tpl.php | 2 +- Theme/Backend/position-profile.tpl.php | 2 +- Theme/Backend/unit-create.tpl.php | 2 +- Theme/Backend/unit-list.tpl.php | 2 +- Theme/Backend/unit-profile.tpl.php | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 3387ffa..ab2f561 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Units", - "uri": "/{/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": "/{/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": "/{/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": "/{/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": "/{/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": "/{/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": "/{/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": "/{/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": "/{/lang}/backend/organization/position/create?{?}", + "uri": "{/lang}/backend/organization/position/create?{?}", "target": "self", "icon": null, "order": 25, diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php index 8bb24f3..a03b92a 100644 --- a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php +++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#org-department-selector-tpl", "aniIn": "fadeIn", "id": "printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "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": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "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} ] } diff --git a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php index 0f6d0bc..28f895c 100644 --- a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php +++ b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#org-position-selector-tpl", "aniIn": "fadeIn", "id": "printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "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": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "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} ] } diff --git a/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php b/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php index d0a36a0..761d901 100644 --- a/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php +++ b/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#org-unit-selector-tpl", "aniIn": "fadeIn", "id": "printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "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": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1} ] } diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 548e138..ac471a8 100644 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> 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('{/lang}/backend/organization/department/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/department-profile.tpl.php b/Theme/Backend/department-profile.tpl.php index f2d5c5d..74e3b00 100644 --- a/Theme/Backend/department-profile.tpl.php +++ b/Theme/Backend/department-profile.tpl.php @@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Department') ?>

-
+ $value) : $count++; - $url = \phpOMS\Uri\UriFactory::build('/{/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 bf6247a..43a209d 100644 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/position-profile.tpl.php b/Theme/Backend/position-profile.tpl.php index b0a6214..b305c7d 100644 --- a/Theme/Backend/position-profile.tpl.php +++ b/Theme/Backend/position-profile.tpl.php @@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Position') ?>

- +
diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php index 9f45953..01e02a6 100644 --- a/Theme/Backend/unit-create.tpl.php +++ b/Theme/Backend/unit-create.tpl.php @@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Unit') ?>

- + getData('list:elements') as $key => $value) : - $url = \phpOMS\Uri\UriFactory::build('/{/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 5ee51f2..a5a9f92 100644 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/unit-profile.tpl.php b/Theme/Backend/unit-profile.tpl.php index fb7db56..51decb0 100644 --- a/Theme/Backend/unit-profile.tpl.php +++ b/Theme/Backend/unit-profile.tpl.php @@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Unit') ?>

- +