Merge branch '1032' into 'stable'

1032



See merge request !1

2 files changed, 2 insertions, 0 deletions

diff --git a/app/Controller/ActionController.php b/app/Controller/ActionController.php
index 097640f6..c935125a 100644
--- a/app/Controller/ActionController.php
+++ b/app/Controller/ActionController.php
@@ -33,6 +33,7 @@ class ActionController extends BaseController
             'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'links_list' => $this->linkModel->getList(0, false),
+            'swimlane_list' => $this->swimlaneModel->getList($project['id']),
             'title' => t('Automatic actions')
         )));
     }
diff --git a/app/Controller/ActionCreationController.php b/app/Controller/ActionCreationController.php
index 9b228f28..1629e68f 100644
--- a/app/Controller/ActionCreationController.php
+++ b/app/Controller/ActionCreationController.php
@@ -84,6 +84,7 @@ class ActionCreationController extends BaseController
             'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project),
             'project' => $project,
             'available_actions' => $this->actionManager->getAvailableActions(),
+            'swimlane_list' => $this->swimlaneModel->getList($project['id']),
             'events' => $this->actionManager->getCompatibleEvents($values['action_name']),
         )));
     }