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

Recurring tasks (#847): move hardcoded conditions to event subscriber + refactoring

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-10 15:15:58 -04:00
parent c9dcd70617
commit bd3c44c3d3
6 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Model/TaskPosition.php
View File

@@ -39,19 +39,6 @@ class TaskPosition extends Base
if ($fire_events) {
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
}
if ($original_task['recurrence_status'] == Task::RECURE_STATUS_PENDING
&& $original_task['column_id'] != $column_id
&& (
($original_task['column_id'] == $this->board->getFirstColumn($project_id)
&& $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_FIRST)
|| ($column_id == $this->board->getLastColumn($project_id)
&& $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_LAST)
)
)
{
$this->taskDuplication->createRecurrence($task_id);
}
}
return $result;
@@ -159,6 +146,8 @@ class TaskPosition extends Base
'src_column_id' => $task['column_id'],
'dst_column_id' => $new_column_id,
'date_moved' => $task['date_moved'],
'recurrence_status' => $task['recurrence_status'],
'recurrence_trigger' => $task['recurrence_trigger'],
);
if ($task['swimlane_id'] != $new_swimlane_id) {