1 files changed, 13 insertions, 17 deletions

diff --git a/app/Controller/Action.php b/app/Controller/Action.php
index 714c87f3..cd24453a 100644
--- a/app/Controller/Action.php
+++ b/app/Controller/Action.php
@@ -17,9 +17,9 @@ class Action extends Base
      */
     public function index()
     {
-        $project = $this->getProjectManagement();
+        $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('action_index', array(
+        $this->response->html($this->projectLayout('action/index', array(
             'values' => array('project_id' => $project['id']),
             'project' => $project,
             'actions' => $this->action->getAllByProject($project['id']),
@@ -27,11 +27,10 @@ class Action extends Base
             'available_events' => $this->action->getAvailableEvents(),
             'available_params' => $this->action->getAllActionParameters(),
             'columns_list' => $this->board->getColumnsList($project['id']),
-            'users_list' => $this->projectPermission->getUsersList($project['id']),
+            'users_list' => $this->projectPermission->getMemberList($project['id']),
             'projects_list' => $this->project->getList(false),
             'colors_list' => $this->color->getList(),
             'categories_list' => $this->category->getList($project['id']),
-            'menu' => 'projects',
             'title' => t('Automatic actions')
         )));
     }
@@ -43,18 +42,17 @@ class Action extends Base
      */
     public function event()
     {
-        $project = $this->getProjectManagement();
+        $project = $this->getProject();
         $values = $this->request->getValues();
 
         if (empty($values['action_name']) || empty($values['project_id'])) {
             $this->response->redirect('?controller=action&action=index&project_id='.$project['id']);
         }
 
-        $this->response->html($this->projectLayout('action_event', array(
+        $this->response->html($this->projectLayout('action/event', array(
             'values' => $values,
             'project' => $project,
             'events' => $this->action->getCompatibleEvents($values['action_name']),
-            'menu' => 'projects',
             'title' => t('Automatic actions')
         )));
     }
@@ -66,7 +64,7 @@ class Action extends Base
      */
     public function params()
     {
-        $project = $this->getProjectManagement();
+        $project = $this->getProject();
         $values = $this->request->getValues();
 
         if (empty($values['action_name']) || empty($values['project_id']) || empty($values['event_name'])) {
@@ -83,16 +81,15 @@ class Action extends Base
         $projects_list = $this->project->getList(false);
         unset($projects_list[$project['id']]);
 
-        $this->response->html($this->projectLayout('action_params', array(
+        $this->response->html($this->projectLayout('action/params', array(
             'values' => $values,
             'action_params' => $action_params,
             'columns_list' => $this->board->getColumnsList($project['id']),
-            'users_list' => $this->projectPermission->getUsersList($project['id']),
+            'users_list' => $this->projectPermission->getMemberList($project['id']),
             'projects_list' => $projects_list,
             'colors_list' => $this->color->getList(),
             'categories_list' => $this->category->getList($project['id']),
             'project' => $project,
-            'menu' => 'projects',
             'title' => t('Automatic actions')
         )));
     }
@@ -104,7 +101,7 @@ class Action extends Base
      */
     public function create()
     {
-        $this->doCreation($this->getProjectManagement(), $this->request->getValues());
+        $this->doCreation($this->getProject(), $this->request->getValues());
     }
 
     /**
@@ -138,14 +135,13 @@ class Action extends Base
      */
     public function confirm()
     {
-        $project = $this->getProjectManagement();
+        $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('action_remove', array(
+        $this->response->html($this->projectLayout('action/remove', array(
             'action' => $this->action->getById($this->request->getIntegerParam('action_id')),
             'available_events' => $this->action->getAvailableEvents(),
             'available_actions' => $this->action->getAvailableActions(),
             'project' => $project,
-            'menu' => 'projects',
             'title' => t('Remove an action')
         )));
     }
@@ -158,10 +154,10 @@ class Action extends Base
     public function remove()
     {
         $this->checkCSRFParam();
-        $project = $this->getProjectManagement();
+        $project = $this->getProject();
         $action = $this->action->getById($this->request->getIntegerParam('action_id'));
 
-        if ($action && $this->action->remove($action['id'])) {
+        if (! empty($action) && $this->action->remove($action['id'])) {
             $this->session->flash(t('Action removed successfully.'));
         } else {
             $this->session->flashError(t('Unable to remove this action.'));