From 624670ce78ae7a68f7207cdb909e882e5e026562 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 2 May 2024 22:54:40 +0000 Subject: [PATCH] Went through todos --- Admin/SearchCommands.php | 33 --------------------------------- Controller/ApiController.php | 2 ++ Models/TaskMapper.php | 16 ++++++++-------- Theme/Backend/task-view.tpl.php | 4 ++-- 4 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 Admin/SearchCommands.php diff --git a/Admin/SearchCommands.php b/Admin/SearchCommands.php deleted file mode 100644 index a0d507d..0000000 --- a/Admin/SearchCommands.php +++ /dev/null @@ -1,33 +0,0 @@ - [ - [ - 'dest' => '\Modules\Tasks\Controller\SearchController:searchGeneral', - 'verb' => RouteVerb::ANY, - 'active' => true, - 'permission' => [ - 'module' => SearchController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::TASK, - ], - ], - ], -]; diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 0eec400..f457926 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -195,6 +195,8 @@ final class ApiController extends Controller * * @return void * + * @performance This should happen in the cli if possible? + * * @since 1.0.0 */ public function createNotifications(TaskElement $ele, int $type, RequestAbstract $request) : void diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index d338e62..6af5294 100755 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -168,7 +168,7 @@ final class TaskMapper extends DataMapperFactory $query->where(self::TABLE . '_d1.task_created_by', '=', $user) ->where(self::TABLE . '_d1.task_status', '=', TaskStatus::OPEN); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -190,7 +190,7 @@ final class TaskMapper extends DataMapperFactory ->where(self::TABLE . '.task_id', '=', $task); return AccountRelationMapper::getAll() - ->execute($query); + ->executeGetArray($query); } /** @@ -213,7 +213,7 @@ final class TaskMapper extends DataMapperFactory ->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::TABLE . '.task_account_duty', '=', DutyType::TO); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -235,7 +235,7 @@ final class TaskMapper extends DataMapperFactory ->where(self::TABLE . '_d1.task_status', '=', TaskStatus::OPEN) ->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $user); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -258,7 +258,7 @@ final class TaskMapper extends DataMapperFactory ->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::TABLE . '.task_account_duty', '=', DutyType::CC); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -275,7 +275,7 @@ final class TaskMapper extends DataMapperFactory $query = self::getQuery(); $query->where(self::TABLE . '_d1.task_created_by', '=', $user); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -297,7 +297,7 @@ final class TaskMapper extends DataMapperFactory ->where(AccountRelationMapper::TABLE . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::TABLE . '.task_account_duty', '=', DutyType::TO); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** @@ -319,7 +319,7 @@ final class TaskMapper extends DataMapperFactory ->where(AccountRelationMapper::TABLE . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::TABLE . '.task_account_duty', '=', DutyType::CC); - return self::getAll()->execute($query); + return self::getAll()->executeGetArray($query); } /** diff --git a/Theme/Backend/task-view.tpl.php b/Theme/Backend/task-view.tpl.php index 135143c..e6e133b 100644 --- a/Theme/Backend/task-view.tpl.php +++ b/Theme/Backend/task-view.tpl.php @@ -138,7 +138,7 @@ echo $this->data['nav']->render(); ?>