From fdaa69abc8087878d7dcc979a2bd0fb0050a0201 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 6 Dec 2020 16:14:42 +0100 Subject: [PATCH] fix templates --- Controller/BackendController.php | 6 +++--- Models/TaskMapper.php | 4 ++-- Theme/Backend/task-single.tpl.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index fdfcca5..348c3e6 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -65,17 +65,17 @@ final class BackendController extends Controller implements DashboardElementInte if ($request->getData('ptype') === 'p') { $view->setData('tasks', TaskMapper::withConditional('language', $response->getLanguage()) - ::getAnyBeforePivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25) + ::getAnyBeforePivot($request->header->account, (int) ($request->getData('id') ?? 0), limit: 25) ); } elseif ($request->getData('ptype') === 'n') { $view->setData('tasks', TaskMapper::withConditional('language', $response->getLanguage()) - ::getAnyAfterPivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25) + ::getAnyAfterPivot($request->header->account, (int) ($request->getData('id') ?? 0), limit: 25) ); } else { $view->setData('tasks', TaskMapper::withConditional('language', $response->getLanguage()) - ::getAnyAfterPivot($request->header->account, 0, null, 25) + ::getAnyAfterPivot($request->header->account, 0, limit: 25) ); } diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index c91d442..1696c8a 100755 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -329,7 +329,7 @@ final class TaskMapper extends DataMapperAbstract */ public static function getAnyBeforePivot( int $user, - $pivot, + mixed $pivot, string $column = null, int $limit = 50, string $order = 'ASC', @@ -371,7 +371,7 @@ final class TaskMapper extends DataMapperAbstract */ public static function getAnyAfterPivot( int $user, - $pivot, + mixed $pivot, string $column = null, int $limit = 50, string $order = 'ASC', diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index 205ea9d..2961b3c 100755 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -180,7 +180,7 @@ echo $this->getData('nav')->render(); ?> $element->createdBy->name1, $element->createdAt->format('Y-m-d H:i') )); ?> - + getHtml('S' . $element->getStatus()); ?> @@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?> $element->createdBy->name1, $element->createdAt->format('Y-m-d H:i') )); ?> - + getHtml('P' . $element->getPriority()); ?>