Refactoring to implement new layout with filters: board/calendar/list views (work in progress)

app/Controller/Calendar.php

@@ -20,20 +20,9 @@ class Calendar extends Base
      */
     public function show()
     {
-        $project = $this->getProject();
-
         $this->response->html($this->template->layout('calendar/show', array(
             'check_interval' => $this->config->get('board_private_refresh_interval'),
-            'users_list' => $this->projectPermission->getMemberList($project['id'], true, true),
-            'categories_list' => $this->category->getList($project['id'], true, true),
-            'columns_list' => $this->board->getColumnsList($project['id'], true),
-            'swimlanes_list' => $this->swimlane->getList($project['id'], true),
-            'colors_list' => $this->color->getList(true),
-            'status_list' => $this->taskStatus->getList(true),
-            'project' => $project,
-            'title' => t('Calendar for "%s"', $project['name']),
-            'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
-        )));
+        ) + $this->getProjectFilters('calendar', 'show')));
     }
 
     /**
@@ -49,14 +38,8 @@ class Calendar extends Base
 
         // Common filter
         $filter = $this->taskFilter
-            ->create()
-            ->filterByProject($project_id)
-            ->filterByCategory($this->request->getIntegerParam('category_id', -1))
-            ->filterByOwner($this->request->getIntegerParam('owner_id', -1))
-            ->filterByColumn($this->request->getIntegerParam('column_id', -1))
-            ->filterBySwimlane($this->request->getIntegerParam('swimlane_id', -1))
-            ->filterByColor($this->request->getStringParam('color_id'))
-            ->filterByStatus($this->request->getIntegerParam('is_active', -1));
+            ->search($this->userSession->getFilters($project_id))
+            ->filterByProject($project_id);
 
         // Tasks
         if ($this->config->get('calendar_project_tasks', 'date_started') === 'date_creation') {