From 9485c5c1f22a3bcd3d8f8ef4a75d93a47b76ae0d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 9 Nov 2022 22:56:18 +0100
Subject: [PATCH] permission changes & minor bug fixes

---
 Admin/Install/Admin.install.json                   |  0
 Admin/Install/Admin.install.php                    |  0
 Admin/Install/Admin.php                            |  0
 Admin/Install/Media/letter.pdf.php                 |  0
 ICAL.txt                                           |  0
 .../department-selector.tpl.php                    |  4 ++--
 .../PositionTagSelector/position-selector.tpl.php  |  4 ++--
 Theme/Backend/Lang/Navigation.ar.lang.php          |  0
 Theme/Backend/Lang/Navigation.cs.lang.php          |  0
 Theme/Backend/Lang/Navigation.da.lang.php          |  0
 Theme/Backend/Lang/Navigation.de.lang.php          |  0
 Theme/Backend/Lang/Navigation.el.lang.php          |  0
 Theme/Backend/Lang/Navigation.en.lang.php          |  0
 Theme/Backend/Lang/Navigation.es.lang.php          |  0
 Theme/Backend/Lang/Navigation.fi.lang.php          |  0
 Theme/Backend/Lang/Navigation.fr.lang.php          |  0
 Theme/Backend/Lang/Navigation.hu.lang.php          |  0
 Theme/Backend/Lang/Navigation.it.lang.php          |  0
 Theme/Backend/Lang/Navigation.ja.lang.php          |  0
 Theme/Backend/Lang/Navigation.ko.lang.php          |  0
 Theme/Backend/Lang/Navigation.no.lang.php          |  0
 Theme/Backend/Lang/Navigation.pl.lang.php          |  0
 Theme/Backend/Lang/Navigation.pt.lang.php          |  0
 Theme/Backend/Lang/Navigation.ru.lang.php          |  0
 Theme/Backend/Lang/Navigation.sv.lang.php          |  0
 Theme/Backend/Lang/Navigation.th.lang.php          |  0
 Theme/Backend/Lang/Navigation.tr.lang.php          |  0
 Theme/Backend/Lang/Navigation.uk.lang.php          |  0
 Theme/Backend/Lang/Navigation.zh.lang.php          |  0
 Theme/Backend/Lang/ar.lang.php                     |  0
 Theme/Backend/Lang/cs.lang.php                     |  0
 Theme/Backend/Lang/da.lang.php                     |  0
 Theme/Backend/Lang/de.lang.php                     |  0
 Theme/Backend/Lang/el.lang.php                     |  0
 Theme/Backend/Lang/en.lang.php                     |  0
 Theme/Backend/Lang/es.lang.php                     |  0
 Theme/Backend/Lang/fi.lang.php                     |  0
 Theme/Backend/Lang/fr.lang.php                     |  0
 Theme/Backend/Lang/hu.lang.php                     |  0
 Theme/Backend/Lang/it.lang.php                     |  0
 Theme/Backend/Lang/ja.lang.php                     |  0
 Theme/Backend/Lang/ko.lang.php                     |  0
 Theme/Backend/Lang/no.lang.php                     |  0
 Theme/Backend/Lang/pl.lang.php                     |  0
 Theme/Backend/Lang/pt.lang.php                     |  0
 Theme/Backend/Lang/ru.lang.php                     |  0
 Theme/Backend/Lang/sv.lang.php                     |  0
 Theme/Backend/Lang/th.lang.php                     |  0
 Theme/Backend/Lang/tr.lang.php                     |  0
 Theme/Backend/Lang/uk.lang.php                     |  0
 Theme/Backend/Lang/zh.lang.php                     |  0
 Theme/Backend/department-list.tpl.php              | 14 +++++++-------
 Theme/Backend/position-list.tpl.php                | 10 +++++-----
 Theme/Backend/unit-list.tpl.php                    | 10 +++++-----
 Theme/Backend/unit-profile.tpl.php                 |  2 +-
 55 files changed, 22 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 Admin/Install/Admin.install.json
 mode change 100644 => 100755 Admin/Install/Admin.install.php
 mode change 100644 => 100755 Admin/Install/Admin.php
 mode change 100644 => 100755 Admin/Install/Media/letter.pdf.php
 mode change 100644 => 100755 ICAL.txt
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ar.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.cs.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.da.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.de.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.el.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.es.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fi.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.hu.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.it.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ja.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ko.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.no.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pl.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pt.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ru.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.sv.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.th.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.tr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.uk.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.zh.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ar.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/cs.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/da.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/de.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/el.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/es.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/fi.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/fr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/hu.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/it.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ja.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ko.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/no.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/pl.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/pt.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ru.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/sv.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/th.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/tr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/uk.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/zh.lang.php

diff --git a/Admin/Install/Admin.install.json b/Admin/Install/Admin.install.json
old mode 100644
new mode 100755
diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php
old mode 100644
new mode 100755
diff --git a/Admin/Install/Admin.php b/Admin/Install/Admin.php
old mode 100644
new mode 100755
diff --git a/Admin/Install/Media/letter.pdf.php b/Admin/Install/Media/letter.pdf.php
old mode 100644
new mode 100755
diff --git a/ICAL.txt b/ICAL.txt
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
index ebc2be3..01b33d2 100755
--- 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": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
-                        {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                        {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?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('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                        {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?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}
                     ]
                 }
diff --git a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
index 1c49f34..8255927 100755
--- 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": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
-                        {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                        {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?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('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                        {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?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}
                     ]
                 }
diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 52bb5a0..81872dc 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -21,11 +21,11 @@ use phpOMS\Uri\UriFactory;
 $departments = $this->getData('departments') ?? [];
 
 $previous = empty($departments)
-    ? '{/prefix}organization/department/list'
-    : '{/prefix}organization/department/list?{?}&id=' . \reset($departments)->getId() . '&ptype=p';
+    ? 'organization/department/list'
+    : 'organization/department/list?{?}&id=' . \reset($departments)->getId() . '&ptype=p';
 $next     = empty($departments)
-    ? '{/prefix}organization/department/list'
-    : '{/prefix}organization/department/list?{?}&id='
+    ? 'organization/department/list'
+    : 'organization/department/list?{?}&id='
         . ($this->getData('hasMore') ? \end($departments)->getId() : $this->request->getData('id'))
         . '&ptype=n';
 
@@ -90,12 +90,12 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                 <?php $c = 0;
                     foreach ($departments as $key => $value) : ++$c;
-                    $url = UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->getId()); ?>
+                    $url = UriFactory::build('organization/department/profile?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
-                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
-                    <td data-label="<?= $this->getHtml('Name'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}organization/unit/profile?{?}&id=' . $value->unit->getId()); ?>"><?= $this->printHtml($value->unit->name); ?></a>
+                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('organization/department/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
+                    <td data-label="<?= $this->getHtml('Name'); ?>"><a class="content" href="<?= UriFactory::build('organization/unit/profile?{?}&id=' . $value->unit->getId()); ?>"><?= $this->printHtml($value->unit->name); ?></a>
                         <?php endforeach; ?>
                 <?php if ($c === 0) : ?>
                 <tr>
diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php
index d593d25..6391773 100755
--- a/Theme/Backend/position-list.tpl.php
+++ b/Theme/Backend/position-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $positions = $this->getData('positions') ?? [];
 
-$previous = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=p';
-$next     = empty($positions) ? '{/prefix}organization/position/list' : '{/prefix}organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n';
+$previous = empty($positions) ? 'organization/position/list' : 'organization/position/list?{?}&id=' . \reset($positions)->getId() . '&ptype=p';
+$next     = empty($positions) ? 'organization/position/list' : 'organization/position/list?{?}&id=' . \end($positions)->getId() . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -83,12 +83,12 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                 <tbody>
                 <?php $count = 0; foreach ($positions as $key => $value) : ++$count;
-                $url         = \phpOMS\Uri\UriFactory::build('{/prefix}organization/position/profile?{?}&id=' . $value->getId()); ?>
+                $url         = \phpOMS\Uri\UriFactory::build('organization/position/profile?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
-                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}organization/position/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
-                    <td data-label="<?= $this->getHtml('Department'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->department->getId()); ?>"><?= $this->printHtml($value->department->name); ?></a>
+                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('organization/position/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
+                    <td data-label="<?= $this->getHtml('Department'); ?>"><a class="content" href="<?= UriFactory::build('organization/department/profile?{?}&id=' . $value->department->getId()); ?>"><?= $this->printHtml($value->department->name); ?></a>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                     <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index e46c688..c4fd39b 100755
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
  */
 $units = $this->getData('units') ?? [];
 
-$previous = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=p';
-$next     = empty($units) ? '{/prefix}organization/unit/list' : '{/prefix}organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n';
+$previous = empty($units) ? 'organization/unit/list' : 'organization/unit/list?{?}&id=' . \reset($units)->getId() . '&ptype=p';
+$next     = empty($units) ? 'organization/unit/list' : 'organization/unit/list?{?}&id=' . \end($units)->getId() . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -84,14 +84,14 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                 <tbody>
                 <?php foreach ($units as $key => $value) :
-                    $url = UriFactory::build('{/prefix}organization/unit/profile?{?}&id=' . $value->getId()); ?>
+                    $url = UriFactory::build('organization/unit/profile?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_profile'); ?>" class="profile-image" src="<?= $value->image instanceof NullMedia ?
                                     UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
-                                    UriFactory::build('{/prefix}' . $value->image->getPath()); ?>"></a>
+                                    UriFactory::build('' . $value->image->getPath()); ?>"></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
-                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}organization/unit/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
+                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a class="content" href="<?= UriFactory::build('organization/unit/profile?{?}&id=' . $value->parent->getId()); ?>"><?= $this->printHtml($value->parent->name); ?></a>
                         <?php endforeach; ?>
             </table>
             </div>
diff --git a/Theme/Backend/unit-profile.tpl.php b/Theme/Backend/unit-profile.tpl.php
index b351260..3365c24 100755
--- a/Theme/Backend/unit-profile.tpl.php
+++ b/Theme/Backend/unit-profile.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
                                 src="<?=
                                 $unit->image instanceof NullMedia ?
                                     UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
-                                    UriFactory::build('{/prefix}' . $unit->image->getPath()); ?>"
+                                    UriFactory::build('' . $unit->image->getPath()); ?>"
                             width="40x">
                         </a>
                     </div>