diff options
author | Frederic Guillot <fred@kanboard.net> | 2016-08-23 20:24:43 -0400 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2016-08-23 20:24:43 -0400 |
commit | fb24b527f2cb8a2020dd91cb63d0e1546f65a777 (patch) | |
tree | afc75c421d899c4fe063430d983e2dc53eac8341 /app/Controller | |
parent | 4ffb4df5fddc110042361485dc5397b4dfe8c85c (diff) | |
parent | 37425d45a621929bfa209f84f101ac8cd42b0d06 (diff) |
Merge pull-request #2587
Diffstat (limited to 'app/Controller')
-rw-r--r-- | app/Controller/ActionController.php | 1 | ||||
-rw-r--r-- | app/Controller/ActionCreationController.php | 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']), ))); } |