From 5d7cff35261b485a994f5346f682fd802218de8d Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 23 Nov 2014 18:33:29 -0500 Subject: Fix some issues --- app/Controller/Task.php | 2 +- app/Model/Base.php | 1 + app/Model/Board.php | 3 +-- app/Model/ProjectDailySummary.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/Controller/Task.php b/app/Controller/Task.php index 8dbd8429..87e7b2f6 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -243,7 +243,7 @@ class Task extends Base $task = $this->getTask(); $values = $this->request->getValues(); - list($valid, $errors) = $this->taskValidator->validateTimeModification($values); + list($valid,) = $this->taskValidator->validateTimeModification($values); if ($valid && $this->taskModification->update($values)) { $this->session->flash(t('Task updated successfully.')); diff --git a/app/Model/Base.php b/app/Model/Base.php index bd9371a7..21353b73 100644 --- a/app/Model/Base.php +++ b/app/Model/Base.php @@ -31,6 +31,7 @@ use PicoDb\Database; * @property \Model\SubTask $subTask * @property \Model\SubtaskHistory $subtaskHistory * @property \Model\Task $task + * @property \Model\TaskCreation $taskCreation * @property \Model\TaskExport $taskExport * @property \Model\TaskFinder $taskFinder * @property \Model\TaskHistory $taskHistory diff --git a/app/Model/Board.php b/app/Model/Board.php index 667bbdbe..9ba2e066 100644 --- a/app/Model/Board.php +++ b/app/Model/Board.php @@ -231,10 +231,9 @@ class Board extends Base * * @access public * @param integer $project_id Project id - * @param array $filters * @return array */ - public function get($project_id, array $filters = array()) + public function get($project_id) { $columns = $this->getColumns($project_id); $tasks = $this->taskFinder->getTasksOnBoard($project_id); diff --git a/app/Model/ProjectDailySummary.php b/app/Model/ProjectDailySummary.php index 25a58368..1e28832e 100644 --- a/app/Model/ProjectDailySummary.php +++ b/app/Model/ProjectDailySummary.php @@ -72,8 +72,8 @@ class ProjectDailySummary extends Base public function countDays($project_id, $from, $to) { $rq = $this->db->execute( - 'SELECT COUNT(DISTINCT day) FROM '.self::TABLE.' WHERE day >= ? AND day <= ?', - array($from, $to) + 'SELECT COUNT(DISTINCT day) FROM '.self::TABLE.' WHERE day >= ? AND day <= ? AND project_id=?', + array($from, $to, $project_id) ); return $rq->fetchColumn(0); -- cgit v1.2.3