Prevent people to remove swimlanes that contains tasks

4 files changed, 6 insertions, 5 deletions

diff --git a/app/Controller/ColumnController.php b/app/Controller/ColumnController.php
index 3facbebc..7047d30e 100644
--- a/app/Controller/ColumnController.php
+++ b/app/Controller/ColumnController.php
@@ -20,7 +20,7 @@ class ColumnController extends BaseController
     public function index()
     {
         $project = $this->getProject();
-        $columns = $this->columnModel->getAllWithTasksCount($project['id']);
+        $columns = $this->columnModel->getAllWithTaskCount($project['id']);
 
         $this->response->html($this->helper->layout->project('column/index', array(
             'columns' => $columns,
diff --git a/app/Controller/ProjectOverviewController.php b/app/Controller/ProjectOverviewController.php
index 33bec078..477c1dd5 100644
--- a/app/Controller/ProjectOverviewController.php
+++ b/app/Controller/ProjectOverviewController.php
@@ -16,7 +16,7 @@ class ProjectOverviewController extends BaseController
     public function show()
     {
         $project = $this->getProject();
-        $columns = $this->columnModel->getAllWithTasksCount($project['id']);
+        $columns = $this->columnModel->getAllWithTaskCount($project['id']);
 
         $this->response->html($this->helper->layout->app('project_overview/show', array(
             'project'     => $project,
diff --git a/app/Controller/ProjectViewController.php b/app/Controller/ProjectViewController.php
index 8ccf36ab..8ff79343 100644
--- a/app/Controller/ProjectViewController.php
+++ b/app/Controller/ProjectViewController.php
@@ -18,7 +18,7 @@ class ProjectViewController extends BaseController
     public function show()
     {
         $project = $this->getProject();
-        $columns = $this->columnModel->getAllWithTasksCount($project['id']);
+        $columns = $this->columnModel->getAllWithTaskCount($project['id']);
 
         $this->response->html($this->helper->layout->project('project_view/show', array(
             'project' => $project,
diff --git a/app/Controller/SwimlaneController.php b/app/Controller/SwimlaneController.php
index d99cfa7a..0d81d83c 100644
--- a/app/Controller/SwimlaneController.php
+++ b/app/Controller/SwimlaneController.php
@@ -40,10 +40,11 @@ class SwimlaneController extends BaseController
     public function index()
     {
         $project = $this->getProject();
+        $swimlanes = $this->swimlaneModel->getAllWithTaskCount($project['id']);
 
         $this->response->html($this->helper->layout->project('swimlane/index', array(
-            'active_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::ACTIVE),
-            'inactive_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::INACTIVE),
+            'active_swimlanes' => $swimlanes['active'],
+            'inactive_swimlanes' => $swimlanes['inactive'],
             'project' => $project,
             'title' => t('Swimlanes')
         )));