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

Merge pull-request #664

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-22 19:12:04 -04:00
parent 72de621d77 546e0ec809
commit 0e5cdfa6ab
4 changed files with 187 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Action.php
View File

@@ -45,6 +45,8 @@ class Action extends Base
'TaskAssignCurrentUser' => t('Assign the task to the person who does the action'),
'TaskDuplicateAnotherProject' => t('Duplicate the task to another project'),
'TaskMoveAnotherProject' => t('Move the task to another project'),
'TaskMoveColumnAssigned' => t('Move the task to another column when assigned to a user'),
'TaskMoveColumnUnAssigned' => t('Move the task to another column when assignee is cleared'),
'TaskAssignColorUser' => t('Assign a color to a specific user'),
'TaskAssignColorCategory' => t('Assign automatically a color based on a category'),
'TaskAssignCategoryColor' => t('Assign automatically a category based on a color'),

5
app/Model/TaskPosition.php
View File

@@ -23,7 +23,7 @@ class TaskPosition extends Base
* @param integer $swimlane_id Swimlane id
* @return boolean
*/
public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0)
public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true)
{
$original_task = $this->taskFinder->getById($task_id);
@@ -35,7 +35,8 @@ class TaskPosition extends Base
$this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
}
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
if ($fire_events)
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
}
return $result;