1 files changed, 18 insertions, 15 deletions

diff --git a/app/Controller/Gantt.php b/app/Controller/Gantt.php
index 24d94f02..9ffa277f 100644
--- a/app/Controller/Gantt.php
+++ b/app/Controller/Gantt.php
@@ -20,13 +20,12 @@ class Gantt extends Base
         if ($this->userSession->isAdmin()) {
             $project_ids = $this->project->getAllIds();
         } else {
-            $project_ids = $this->projectPermission->getMemberProjectIds($this->userSession->getId());
+            $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
         }
 
-        $this->response->html($this->template->layout('gantt/projects', array(
+        $this->response->html($this->helper->layout->app('gantt/projects', array(
             'projects' => $this->projectGanttFormatter->filter($project_ids)->format(),
             'title' => t('Gantt chart for all projects'),
-            'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
         )));
     }
 
@@ -65,8 +64,8 @@ class Gantt extends Base
             $filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position');
         }
 
-        $this->response->html($this->template->layout('gantt/project', $params + array(
-            'users_list' => $this->projectPermission->getMemberList($params['project']['id'], false),
+        $this->response->html($this->helper->layout->app('gantt/project', $params + array(
+            'users_list' => $this->projectUserRole->getAssignableUsersList($params['project']['id'], false),
             'sorting' => $sorting,
             'tasks' => $filter->format(),
         )));
@@ -102,19 +101,23 @@ class Gantt extends Base
     {
         $project = $this->getProject();
 
+        $values = $values + array(
+            'project_id' => $project['id'],
+            'column_id' => $this->column->getFirstColumnId($project['id']),
+            'position' => 1
+        );
+
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:gantt:task:form:default', $values, array('default_values' => $values));
+
         $this->response->html($this->template->render('gantt/task_creation', array(
+            'project' => $project,
             'errors' => $errors,
-            'values' => $values + array(
-                'project_id' => $project['id'],
-                'column_id' => $this->board->getFirstColumn($project['id']),
-                'position' => 1
-            ),
-            'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true),
+            'values' => $values,
+            'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
             'colors_list' => $this->color->getList(),
             'categories_list' => $this->category->getList($project['id']),
             'swimlanes_list' => $this->swimlane->getList($project['id'], false, true),
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
             'title' => $project['name'].' > '.t('New task')
         )));
     }
@@ -135,10 +138,10 @@ class Gantt extends Base
             $task_id = $this->taskCreation->create($values);
 
             if ($task_id !== false) {
-                $this->session->flash(t('Task created successfully.'));
+                $this->flash->success(t('Task created successfully.'));
                 $this->response->redirect($this->helper->url->to('gantt', 'project', array('project_id' => $project['id'])));
             } else {
-                $this->session->flashError(t('Unable to create your task.'));
+                $this->flash->failure(t('Unable to create your task.'));
             }
         }