Fix bug: closing all tasks by column, also update closed tasks

2016-04-29 17:44:06 -04:00
parent fc8f8748b9
commit a34f83fb30
3 changed files with 15 additions and 1 deletions
--- a/app/Model/TaskStatus.php
+++ b/app/Model/TaskStatus.php
@@ -83,7 +83,13 @@ class TaskStatus extends Base
     */
    public function closeTasksBySwimlaneAndColumn($swimlane_id, $column_id)
    {
-        $task_ids = $this->db->table(Task::TABLE)->eq('swimlane_id', $swimlane_id)->eq('column_id', $column_id)->findAllByColumn('id');
+        $task_ids = $this->db
+            ->table(Task::TABLE)
+            ->eq('swimlane_id', $swimlane_id)
+            ->eq('column_id', $column_id)
+            ->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN)
+            ->findAllByColumn('id');
+
        $this->closeMultipleTasks($task_ids);
    }