diff options
| author | Imbasaur <yarrusg@gmail.com> | 2016-04-13 17:05:59 +0200 |
|---|---|---|
| committer | Imbasaur <yarrusg@gmail.com> | 2016-04-13 17:05:59 +0200 |
| commit | 99f275e5bb033cca33eee87b0e914645730f13d1 (patch) | |
| tree | ad845419d56304f2bf014744f0878186f7155a3c /app/Controller/Analytic.php | |
| parent | 13d5bd8e48bd6c0109d1272da58a8879bf9a6737 (diff) | |
| parent | cd5bf9d4d214ec9282b706c26bb27cabf150ee63 (diff) | |
Merge pull request #1 from fguillot/master
Diffstat (limited to 'app/Controller/Analytic.php')
| -rw-r--r-- | app/Controller/Analytic.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/Controller/Analytic.php b/app/Controller/Analytic.php index 6ce062c4..35bc3048 100644 --- a/app/Controller/Analytic.php +++ b/app/Controller/Analytic.php @@ -2,6 +2,7 @@ namespace Kanboard\Controller; +use Kanboard\Filter\TaskProjectFilter; use Kanboard\Model\Task as TaskModel; /** @@ -44,14 +45,15 @@ class Analytic extends Base public function compareHours() { $project = $this->getProject(); - $params = $this->getProjectFilters('analytic', 'compareHours'); - $query = $this->taskFilter->create()->filterByProject($params['project']['id'])->getQuery(); $paginator = $this->paginator ->setUrl('analytic', 'compareHours', array('project_id' => $project['id'])) ->setMax(30) ->setOrder(TaskModel::TABLE.'.id') - ->setQuery($query) + ->setQuery($this->taskQuery + ->withFilter(new TaskProjectFilter($project['id'])) + ->getQuery() + ) ->calculate(); $this->response->html($this->helper->layout->analytic('analytic/compare_hours', array( |