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

Improve pull-request

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-11 20:46:14 -05:00
parent 59ee6f9fee
commit 2c512f93ac
22 changed files with 129 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/TaskFinder.php
View File

@@ -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,

5
app/Model/TaskPosition.php
View File

@@ -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']);
}