AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential issue with conflict namespace

This commit is contained in:
Frederic Guillot 2015-08-14 21:53:29 -04:00
parent de6bcb97bf
commit 536127c5a1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/Gantt.php
View File

@ -2,7 +2,7 @@
namespace Controller;
use Model\Task;
use Model\Task as TaskModel;
/**
* Gantt controller
@ -19,13 +19,13 @@ class Gantt extends Base
{
$project = $this->getProject();
$sorting = $this->request->getStringParam('sorting', 'board');
$filter = $this->taskFilter->gantt()->filterByProject($project['id'])->filterByStatus(Task::STATUS_OPEN);
$filter = $this->taskFilter->gantt()->filterByProject($project['id'])->filterByStatus(TaskModel::STATUS_OPEN);
if ($sorting === 'date') {
$filter->query->asc(Task::TABLE.'.date_started')->asc(Task::TABLE.'.date_creation');
$filter->query->asc(TaskModel::TABLE.'.date_started')->asc(TaskModel::TABLE.'.date_creation');
}
else {
$filter->query->asc('column_position')->asc(Task::TABLE.'.position');
$filter->query->asc('column_position')->asc(TaskModel::TABLE.'.position');
}
$this->response->html($this->template->layout('gantt/project', array(