From 3a96d97d0a19f82e02a0b498f89b47057654c23a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 6 Dec 2020 11:13:19 +0100 Subject: [PATCH] tpl fixes, dont use printHtml for none-string types --- Theme/Backend/department-list.tpl.php | 4 ++-- Theme/Backend/staff-list.tpl.php | 8 ++++---- Theme/Backend/staff-single.tpl.php | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 909c9a5..be2096a 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -42,10 +42,10 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; $url = \phpOMS\Uri\UriFactory::build('{/prefix}hr/department/single?{?}&id=' . $value->getId()); ?> - printHtml($value->getId()); ?> + getId(); ?> printHtml($value->name); ?> - printHtml($value->parent->getName()); ?> + printHtml($value->parent->name); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/staff-list.tpl.php b/Theme/Backend/staff-list.tpl.php index e2f51e0..f841043 100755 --- a/Theme/Backend/staff-list.tpl.php +++ b/Theme/Backend/staff-list.tpl.php @@ -38,13 +38,13 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; $url = \phpOMS\Uri\UriFactory::build('{/prefix}humanresource/staff/profile?{?}&id=' . $value->getId()); ?> - printHtml($value->getId()); ?> + getId(); ?> printHtml( \sprintf('%3$s %2$s %1$s', $value->profile->account->name1, $value->profile->account->name2, $value->profile->account->name3) ); ?> - printHtml($value->getNewestHistory()->getUnit()->getName()); ?> - printHtml($value->getNewestHistory()->getPosition()->getName()); ?> - printHtml($value->getNewestHistory()->getDepartment()->getName()); ?> + printHtml($value->getNewestHistory()->getUnit()->name); ?> + printHtml($value->getNewestHistory()->getPosition()->name); ?> + printHtml($value->getNewestHistory()->getDepartment()->name); ?> getNewestHistory() instanceof NullEmployeeHistory) ? $this->getHtml('Active') : $this->getHtml('Inactive'); ?> diff --git a/Theme/Backend/staff-single.tpl.php b/Theme/Backend/staff-single.tpl.php index 1c67a0d..a2ebfde 100755 --- a/Theme/Backend/staff-single.tpl.php +++ b/Theme/Backend/staff-single.tpl.php @@ -59,13 +59,13 @@ echo $this->getData('nav')->render(); ?>
getHtml('Position'); ?> - printHtml($recentHistory->getPosition()->getName()); ?> + printHtml($recentHistory->getPosition()->name); ?>
getHtml('Department'); ?> - printHtml($recentHistory->getDepartment()->getName()); ?> + printHtml($recentHistory->getDepartment()->name); ?>
getHtml('Unit'); ?> - printHtml($recentHistory->getUnit()->getName()); ?> + printHtml($recentHistory->getUnit()->name); ?>
getHtml('Birthday'); ?> 06.09.1934 @@ -119,9 +119,9 @@ echo $this->getData('nav')->render(); ?>
getStart()->format('Y-m-d'); ?> getEnd() === null ? '' : $hist->getEnd()->format('Y-m-d'); ?> - printHtml($hist->getUnit()->getName()); ?> - printHtml($hist->getDepartment()->getName()); ?> - printHtml($hist->getPosition()->getName()); ?> + printHtml($hist->getUnit()->name); ?> + printHtml($hist->getDepartment()->name); ?> + printHtml($hist->getPosition()->name); ?>