From 86c950743f2d923a37de3f3a91344dae62a1015e Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 31 Jul 2016 15:10:42 -0400 Subject: Move API calls for task metadata to a separate class --- app/Api/Procedure/TaskMetadataProcedure.php | 38 +++++++++++++++++++++++++++++ app/Api/Procedure/TaskProcedure.php | 27 +------------------- 2 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 app/Api/Procedure/TaskMetadataProcedure.php (limited to 'app/Api/Procedure') diff --git a/app/Api/Procedure/TaskMetadataProcedure.php b/app/Api/Procedure/TaskMetadataProcedure.php new file mode 100644 index 00000000..169482f5 --- /dev/null +++ b/app/Api/Procedure/TaskMetadataProcedure.php @@ -0,0 +1,38 @@ +container)->check($this->getClassName(), 'getTask', $task_id); + return $this->taskMetadataModel->getAll($task_id); + } + + public function getTaskMetadataByName($task_id, $name) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id); + return $this->taskMetadataModel->get($task_id, $name); + } + + public function saveTaskMetadata($task_id, array $values) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id); + return $this->taskMetadataModel->save($task_id, $values); + } + + public function removeTaskMetadata($task_id, $name) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id); + return $this->taskMetadataModel->remove($task_id, $name); + } +} diff --git a/app/Api/Procedure/TaskProcedure.php b/app/Api/Procedure/TaskProcedure.php index 59075b13..ee9242d1 100644 --- a/app/Api/Procedure/TaskProcedure.php +++ b/app/Api/Procedure/TaskProcedure.php @@ -6,7 +6,6 @@ use Kanboard\Api\Authorization\ProjectAuthorization; use Kanboard\Api\Authorization\TaskAuthorization; use Kanboard\Filter\TaskProjectFilter; use Kanboard\Model\TaskModel; -use Kanboard\Model\TaskMetadataModel; /** * Task API controller @@ -16,30 +15,6 @@ use Kanboard\Model\TaskMetadataModel; */ class TaskProcedure extends BaseProcedure { - public function getTaskMetadata($task_id) - { - TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id); - return $this->taskMetadataModel->getAll($task_id); - } - - public function getTaskMetadataByName($task_id, $name) - { - TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id); - return $this->taskMetadataModel->get($task_id, $name); - } - - public function saveTaskMetadata($task_id, array $values) - { - TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id); - return $this->taskMetadataModel->save($task_id, $values); - } - - public function removeTaskMetadata($task_id, $name) - { - TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id); - return $this->taskMetadataModel->remove($task_id, $name); - } - public function searchTasks($project_id, $query) { ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'searchTasks', $project_id); @@ -117,7 +92,7 @@ class TaskProcedure extends BaseProcedure $recurrence_basedate = 0, $reference = '') { ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTask', $project_id); - + if ($owner_id !== 0 && ! $this->projectPermissionModel->isAssignable($project_id, $owner_id)) { return false; } -- cgit v1.2.3