From 26492aba7ee2bfb8c525ea0aaa580aff47a414ba Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 31 Jan 2016 21:44:49 -0500
Subject: Simplify layout and templates generation

---
 app/Controller/Action.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/Controller/Action.php')

diff --git a/app/Controller/Action.php b/app/Controller/Action.php
index 645b53b7..482a210b 100644
--- a/app/Controller/Action.php
+++ b/app/Controller/Action.php
@@ -20,7 +20,7 @@ class Action extends Base
         $project = $this->getProject();
         $actions = $this->action->getAllByProject($project['id']);
 
-        $this->response->html($this->projectLayout('action/index', array(
+        $this->response->html($this->helper->layout->project('action/index', array(
             'values' => array('project_id' => $project['id']),
             'project' => $project,
             'actions' => $actions,
@@ -51,7 +51,7 @@ class Action extends Base
             $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
         }
 
-        $this->response->html($this->projectLayout('action/event', array(
+        $this->response->html($this->helper->layout->project('action/event', array(
             'values' => $values,
             'project' => $project,
             'events' => $this->actionManager->getCompatibleEvents($values['action_name']),
@@ -83,7 +83,7 @@ class Action extends Base
         $projects_list = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
         unset($projects_list[$project['id']]);
 
-        $this->response->html($this->projectLayout('action/params', array(
+        $this->response->html($this->helper->layout->project('action/params', array(
             'values' => $values,
             'action_params' => $action_params,
             'columns_list' => $this->board->getColumnsList($project['id']),
@@ -138,7 +138,7 @@ class Action extends Base
     {
         $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('action/remove', array(
+        $this->response->html($this->helper->layout->project('action/remove', array(
             'action' => $this->action->getById($this->request->getIntegerParam('action_id')),
             'available_events' => $this->eventManager->getAll(),
             'available_actions' => $this->actionManager->getAvailableActions(),
-- 
cgit v1.2.3