Simplify dashboard to use new tasks list view

2 files changed, 5 insertions, 55 deletions

diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index a1734af1..7a58e670 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -19,7 +19,7 @@ class ActivityController extends BaseController
     {
         $user = $this->getUser();
 
-        $this->response->html($this->helper->layout->dashboard('activity/user', array(
+        $this->response->html($this->template->render('activity/user', array(
             'title'  => t('Activity stream for %s', $this->helper->user->getFullname($user)),
             'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
             'user'   => $user,
diff --git a/app/Controller/DashboardController.php b/app/Controller/DashboardController.php
index 7fdc53ff..ef7d8772 100644
--- a/app/Controller/DashboardController.php
+++ b/app/Controller/DashboardController.php
@@ -19,60 +19,10 @@ class DashboardController extends BaseController
     {
         $user = $this->getUser();
 
-        $this->response->html($this->helper->layout->dashboard('dashboard/show', array(
-            'title' => t('Dashboard for %s', $this->helper->user->getFullname($user)),
-            'project_paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'show', 10),
-            'task_paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'show', 10),
-            'subtask_paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'show', 10),
-            'user' => $user,
-        )));
-    }
-
-    /**
-     * My tasks
-     *
-     * @access public
-     */
-    public function tasks()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->dashboard('dashboard/tasks', array(
-            'title' => t('Tasks overview for %s', $this->helper->user->getFullname($user)),
-            'paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'tasks', 50),
-            'user' => $user,
-        )));
-    }
-
-    /**
-     * My subtasks
-     *
-     * @access public
-     */
-    public function subtasks()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->dashboard('dashboard/subtasks', array(
-            'title' => t('Subtasks overview for %s', $this->helper->user->getFullname($user)),
-            'paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'subtasks', 50),
-            'user' => $user,
-        )));
-    }
-
-    /**
-     * My projects
-     *
-     * @access public
-     */
-    public function projects()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->dashboard('dashboard/projects', array(
-            'title' => t('Projects overview for %s', $this->helper->user->getFullname($user)),
-            'paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'projects', 25),
-            'user' => $user,
+        $this->response->html($this->helper->layout->app('dashboard/show', array(
+            'title'   => t('Dashboard for %s', $this->helper->user->getFullname($user)),
+            'user'    => $user,
+            'results' => $this->dashboardPagination->getOverview($user['id']),
         )));
     }
 }