diff options
author | phecho <phecho@163.com> | 2016-12-21 10:58:41 +0800 |
---|---|---|
committer | phecho <phecho@163.com> | 2016-12-21 10:58:41 +0800 |
commit | 4724367e3b9c10af23bb6596f8f678477927c8c3 (patch) | |
tree | 06ee4e860252222c1784e182d87e22b879451751 /app/Controller/ProjectGanttController.php | |
parent | 56d00ac1592ba5ab7006dfd161f1893e1fdc9bb0 (diff) | |
parent | 9d5d389de841705450190fb1ebbaa11393870dfe (diff) |
Fix conflict
Diffstat (limited to 'app/Controller/ProjectGanttController.php')
-rw-r--r-- | app/Controller/ProjectGanttController.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/Controller/ProjectGanttController.php b/app/Controller/ProjectGanttController.php index a70d9eee..8239005e 100644 --- a/app/Controller/ProjectGanttController.php +++ b/app/Controller/ProjectGanttController.php @@ -5,7 +5,6 @@ namespace Kanboard\Controller; use Kanboard\Filter\ProjectIdsFilter; use Kanboard\Filter\ProjectStatusFilter; use Kanboard\Filter\ProjectTypeFilter; -use Kanboard\Formatter\ProjectGanttFormatter; use Kanboard\Model\ProjectModel; /** @@ -30,7 +29,7 @@ class ProjectGanttController extends BaseController $filter->getQuery()->asc(ProjectModel::TABLE.'.start_date'); $this->response->html($this->helper->layout->app('project_gantt/show', array( - 'projects' => $filter->format(new ProjectGanttFormatter($this->container)), + 'projects' => $filter->format($this->projectGanttFormatter), 'title' => t('Gantt chart for all projects'), ))); } |