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/Activity.php | |
| parent | 13d5bd8e48bd6c0109d1272da58a8879bf9a6737 (diff) | |
| parent | cd5bf9d4d214ec9282b706c26bb27cabf150ee63 (diff) | |
Merge pull request #1 from fguillot/master
Diffstat (limited to 'app/Controller/Activity.php')
| -rw-r--r-- | app/Controller/Activity.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/Controller/Activity.php b/app/Controller/Activity.php index db520ebe..47a66e0a 100644 --- a/app/Controller/Activity.php +++ b/app/Controller/Activity.php @@ -20,7 +20,7 @@ class Activity extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->app('activity/project', array( - 'events' => $this->projectActivity->getProject($project['id']), + 'events' => $this->helper->projectActivity->getProjectEvents($project['id']), 'project' => $project, 'title' => t('%s\'s activity', $project['name']) ))); @@ -38,7 +38,8 @@ class Activity extends Base $this->response->html($this->helper->layout->task('activity/task', array( 'title' => $task['title'], 'task' => $task, - 'events' => $this->projectActivity->getTask($task['id']), + 'project' => $this->project->getById($task['project_id']), + 'events' => $this->helper->projectActivity->getTaskEvents($task['id']), ))); } } |