From 791c4abd5749331a01cc64b838f4fa0a99206169 Mon Sep 17 00:00:00 2001 From: Franky Van Liedekerke Date: Sun, 26 Apr 2020 20:29:26 +0200 Subject: [PATCH] Copy subtask assignee when duplicating a subtask Closes #4469 --- app/Model/SubtaskModel.php | 2 +- tests/units/Model/SubtaskModelTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php index f02ac232f..440f49d2f 100644 --- a/app/Model/SubtaskModel.php +++ b/app/Model/SubtaskModel.php @@ -281,7 +281,7 @@ class SubtaskModel extends Base return $this->db->transaction(function (Database $db) use ($srcTaskId, $dstTaskId) { $subtasks = $db->table(SubtaskModel::TABLE) - ->columns('title', 'time_estimated', 'position') + ->columns('title', 'time_estimated', 'position','user_id') ->eq('task_id', $srcTaskId) ->asc('position') ->findAll(); diff --git a/tests/units/Model/SubtaskModelTest.php b/tests/units/Model/SubtaskModelTest.php index 8ad054d1f..d032b0b81 100644 --- a/tests/units/Model/SubtaskModelTest.php +++ b/tests/units/Model/SubtaskModelTest.php @@ -153,8 +153,8 @@ class SubtaskModelTest extends Base $this->assertEquals(0, $subtasks[1]['status']); $this->assertEquals(0, $subtasks[0]['user_id']); - $this->assertEquals(0, $subtasks[1]['user_id']); - + $this->assertEquals(1, $subtasks[1]['user_id']); + $this->assertEquals(1, $subtasks[0]['position']); $this->assertEquals(2, $subtasks[1]['position']); }