From 73dce1279760434e1d1b7a903a0a7500462d6f9c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 8 Feb 2017 18:36:13 -0500
Subject: Prevent people to remove columns that contains tasks

---
 app/Model/TaskFinderModel.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/Model/TaskFinderModel.php')

diff --git a/app/Model/TaskFinderModel.php b/app/Model/TaskFinderModel.php
index 3185afb7..e54a613b 100644
--- a/app/Model/TaskFinderModel.php
+++ b/app/Model/TaskFinderModel.php
@@ -367,17 +367,18 @@ class TaskFinderModel extends Base
      * Count the number of tasks for a given column and status
      *
      * @access public
-     * @param  integer   $project_id   Project id
-     * @param  integer   $column_id    Column id
-     * @return integer
+     * @param  integer $project_id Project id
+     * @param  integer $column_id Column id
+     * @param  array   $status
+     * @return int
      */
-    public function countByColumnId($project_id, $column_id)
+    public function countByColumnId($project_id, $column_id, array $status = array(TaskModel::STATUS_OPEN))
     {
         return $this->db
                     ->table(TaskModel::TABLE)
                     ->eq('project_id', $project_id)
                     ->eq('column_id', $column_id)
-                    ->eq('is_active', 1)
+                    ->in('is_active', $status)
                     ->count();
     }
 
-- 
cgit v1.2.3