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

Fix automatic action condition check 

Checks for source column instead of current column because the condition 
is "moved away"
Closes #4277
This commit is contained in:
Rafael de Camargo 2019-08-28 00:23:48 -03:00 committed by Frédéric Guillot
parent c6df7c081a
commit c0d8407d9a
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Action/TaskUpdateStartDateOnMoveColumn.php
View File

@ -60,8 +60,8 @@ class TaskUpdateStartDateOnMoveColumn extends Base
'task_id',
'task' => array(
'project_id',
'column_id',
),
'src_column_id',
);
}
@ -91,6 +91,6 @@ class TaskUpdateStartDateOnMoveColumn extends Base
*/
public function hasRequiredCondition(array $data)
{
return empty($data['task']['date_started']) && $data['task']['column_id'] != $this->getParam('column_id');
return empty($data['task']['date_started']) && $data['src_column_id'] == $this->getParam('column_id');
}
}

38
tests/units/Action/TaskUpdateStartDateOnMoveColumnTest.php
View File

@ -19,17 +19,13 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 1)));
$this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 2));
$task = $taskFinderModel->getById(1);
$this->assertNotEmpty($task);
$event = new TaskEvent(array(
'task_id' => $task['id'],
'task_id' => 1,
'task' => array(
'project_id' => $task['project_id'],
'column_id' => $task['column_id'],
)
'project_id' => 1,
),
'src_column_id' => 1,
));
$action = new TaskUpdateStartDateOnMoveColumn($this->container);
@ -49,17 +45,13 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 2)));
$this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 1));
$task = $taskFinderModel->getById(1);
$this->assertNotEmpty($task);
$event = new TaskEvent(array(
'task_id' => $task['id'],
'task_id' => 1,
'task' => array(
'project_id' => $task['project_id'],
'column_id' => $task['column_id'],
)
'project_id' => 1,
),
'src_column_id' => 2,
));
$action = new TaskUpdateStartDateOnMoveColumn($this->container);
@ -76,18 +68,14 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 1, 'date_started' => time())));
$this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 2));
$task = $taskFinderModel->getById(1);
$this->assertNotEmpty($task);
$event = new TaskEvent(array(
'task_id' => $task['id'],
'task_id' => 1,
'task' => array(
'project_id' => $task['project_id'],
'column_id' => $task['column_id'],
'date_started' => $task['date_started'],
)
'project_id' => 1,
'date_started' => time(),
),
'src_column_id' => 1,
));
$action = new TaskUpdateStartDateOnMoveColumn($this->container);