diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-02-11 20:46:14 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-02-11 20:46:14 -0500 |
| commit | 2c512f93acf6ce3e83e4600c199371ee5eb4f3a6 (patch) | |
| tree | ed0c308dc6e8268899e78dca50f093131e8f5896 /app/Model | |
| parent | 59ee6f9fee1c8a8245d859c8788d6819223e3d20 (diff) | |
Improve pull-request
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/TaskFinder.php | 4 | ||||
| -rw-r--r-- | app/Model/TaskPosition.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 05168593..27fa8150 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -102,7 +102,7 @@ class TaskFinder extends Base 'tasks.is_active', 'tasks.score', 'tasks.category_id', - 'tasks.date_moved', + 'tasks.date_moved', 'users.username AS assignee_username', 'users.name AS assignee_name' ) @@ -243,7 +243,7 @@ class TaskFinder extends Base tasks.score, tasks.category_id, tasks.swimlane_id, - tasks.date_moved, + tasks.date_moved, project_has_categories.name AS category_name, projects.name AS project_name, columns.title AS column_title, diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php index 9733999b..b8d9d7bf 100644 --- a/app/Model/TaskPosition.php +++ b/app/Model/TaskPosition.php @@ -30,10 +30,11 @@ class TaskPosition extends Base $result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id); if ($result) { + if ($original_task['column_id'] != $column_id) { - $this->db->table(Task::TABLE)->eq('id', $task_id)->update(array('date_moved' => time(), - )); + $this->db->table(Task::TABLE)->eq('id', $task_id)->update(array('date_moved' => time())); } + if ($original_task['swimlane_id'] != $swimlane_id) { $this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']); } |