AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatic Actions now support Swimlanes

Browse Source
This commit is contained in:
dalmond
2016-08-17 12:20:12 +01:00
committed by David Almond
parent 98efcf21e3
commit 5c685a2a78
7 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/ActionController.php
View File

@@ -33,6 +33,7 @@ class ActionController extends BaseController
'colors_list' => $this->colorModel->getList(), 'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']), 'categories_list' => $this->categoryModel->getList($project['id']),
'links_list' => $this->linkModel->getList(0, false), 'links_list' => $this->linkModel->getList(0, false),
'swimlane_list' => $this->swimlaneModel->getList($project['id']),
'title' => t('Automatic actions') 'title' => t('Automatic actions')
))); )));
} }

1
app/Controller/ActionCreationController.php
View File

@@ -84,6 +84,7 @@ class ActionCreationController extends BaseController
'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project), 'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project),
'project' => $project, 'project' => $project,
'available_actions' => $this->actionManager->getAvailableActions(), 'available_actions' => $this->actionManager->getAvailableActions(),
'swimlane_list' => $this->swimlaneModel->getList($project['id']),
'events' => $this->actionManager->getCompatibleEvents($values['action_name']), 'events' => $this->actionManager->getCompatibleEvents($values['action_name']),
))); )));
} }

1
app/Core/Event/EventManager.php
View File

@@ -53,6 +53,7 @@ class EventManager
TaskModel::EVENT_CREATE_UPDATE => t('Task creation or modification'), TaskModel::EVENT_CREATE_UPDATE => t('Task creation or modification'),
TaskModel::EVENT_ASSIGNEE_CHANGE => t('Task assignee change'), TaskModel::EVENT_ASSIGNEE_CHANGE => t('Task assignee change'),
TaskModel::EVENT_DAILY_CRONJOB => t('Daily background job for tasks'), TaskModel::EVENT_DAILY_CRONJOB => t('Daily background job for tasks'),
TaskModel::EVENT_MOVE_SWIMLANE => t('Move a task to another swimlane'),
); );
$events = array_merge($events, $this->events); $events = array_merge($events, $this->events);

5
app/Model/ActionParameterModel.php
View File

@@ -157,7 +157,10 @@ class ActionParameterModel extends Base
case 'user_id': case 'user_id':
case 'owner_id': case 'owner_id':
return $this->projectPermissionModel->isAssignable($project_id, $value) ? $value : false; return $this->projectPermissionModel->isAssignable($project_id, $value) ? $value : false;
default: case 'swimlane_id':
$column = $this->swimlaneModel->getById($value);
return empty($column) ? false : $this->swimlaneModel->getIdByName($project_id, $column['name']) ?: false;
default:
return $value; return $value;
} }
} }

4
app/ServiceProvider/ActionProvider.php
View File

@@ -36,6 +36,8 @@ use Kanboard\Action\TaskOpen;
use Kanboard\Action\TaskUpdateStartDate; use Kanboard\Action\TaskUpdateStartDate;
use Kanboard\Action\TaskCloseNoActivity; use Kanboard\Action\TaskCloseNoActivity;
use Kanboard\Action\TaskCloseNoActivityColumn; use Kanboard\Action\TaskCloseNoActivityColumn;
use Kanboard\Action\TaskAssignColorSwimlane;
use Kanboard\Action\TaskAssignPrioritySwimlane;
/** /**
* Action Provider * Action Provider
@@ -86,6 +88,8 @@ class ActionProvider implements ServiceProviderInterface
$container['actionManager']->register(new TaskOpen($container)); $container['actionManager']->register(new TaskOpen($container));
$container['actionManager']->register(new TaskUpdateStartDate($container)); $container['actionManager']->register(new TaskUpdateStartDate($container));
$container['actionManager']->register(new TaskAssignDueDateOnCreation($container)); $container['actionManager']->register(new TaskAssignDueDateOnCreation($container));
$container['actionManager']->register(new TaskAssignColorSwimlane($container));
$container['actionManager']->register(new TaskAssignPrioritySwimlane($container));
return $container; return $container;
} }

2
app/Template/action/index.php
View File

@@ -54,6 +54,8 @@
<?= $this->text->in($param_value, $categories_list) ?> <?= $this->text->in($param_value, $categories_list) ?>
<?php elseif ($this->text->contains($param_name, 'link_id')): ?> <?php elseif ($this->text->contains($param_name, 'link_id')): ?>
<?= $this->text->in($param_value, $links_list) ?> <?= $this->text->in($param_value, $links_list) ?>
<?php elseif ($this->text->contains($param_name, 'swimlane_id')): ?>
<?= $this->text->in($param_value, $swimlane_list) ?>
<?php else: ?> <?php else: ?>
<?= $this->text->e($param_value) ?> <?= $this->text->e($param_value) ?>
<?php endif ?> <?php endif ?>

7
app/Template/action_creation/params.php
View File

@@ -41,10 +41,13 @@
<?php elseif ($this->text->contains($param_name, 'duration')): ?> <?php elseif ($this->text->contains($param_name, 'duration')): ?>
<?= $this->form->label($param_desc, $param_name) ?> <?= $this->form->label($param_desc, $param_name) ?>
<?= $this->form->number('params['.$param_name.']', $values) ?> <?= $this->form->number('params['.$param_name.']', $values) ?>
<?php else: ?> <?php elseif ($this->text->contains($param_name, 'swimlane_id')): ?>
<?= $this->form->label($param_desc, $param_name) ?>
<?= $this->form->select('params['.$param_name.']', $swimlane_list, $values) ?>
<?php else: ?>
<?= $this->form->label($param_desc, $param_name) ?> <?= $this->form->label($param_desc, $param_name) ?>
<?= $this->form->text('params['.$param_name.']', $values) ?> <?= $this->form->text('params['.$param_name.']', $values) ?>
<?php endif ?> <?php endif ?>
<?php endforeach ?> <?php endforeach ?>
<div class="form-actions"> <div class="form-actions">