1 files changed, 5 insertions, 5 deletions
diff --git a/app/Controller/BoardPopoverController.php b/app/Controller/BoardPopoverController.php
index 2c2e5dc6..a0f5ae12 100644
--- a/app/Controller/BoardPopoverController.php
+++ b/app/Controller/BoardPopoverController.php
@@ -23,9 +23,9 @@ class BoardPopoverController extends BaseController
 
         $this->response->html($this->template->render('board_popover/close_all_tasks_column', array(
             'project' => $project,
-            'nb_tasks' => $this->taskFinder->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id),
-            'column' => $this->column->getColumnTitleById($column_id),
-            'swimlane' => $this->swimlane->getNameById($swimlane_id) ?: t($project['default_swimlane']),
+            'nb_tasks' => $this->taskFinderModel->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id),
+            'column' => $this->columnModel->getColumnTitleById($column_id),
+            'swimlane' => $this->swimlaneModel->getNameById($swimlane_id) ?: t($project['default_swimlane']),
             'values' => array('column_id' => $column_id, 'swimlane_id' => $swimlane_id),
         )));
     }
@@ -40,8 +40,8 @@ class BoardPopoverController extends BaseController
         $project = $this->getProject();
         $values = $this->request->getValues();
 
-        $this->taskStatus->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']);
-        $this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->column->getColumnTitleById($values['column_id']), $this->swimlane->getNameById($values['swimlane_id']) ?: t($project['default_swimlane'])));
+        $this->taskStatusModel->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']);
+        $this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->columnModel->getColumnTitleById($values['column_id']), $this->swimlaneModel->getNameById($values['swimlane_id']) ?: t($project['default_swimlane'])));
         $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])));
     }
 }