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

Split Board model into multiple classes

Browse Source
This commit is contained in:
Frederic Guillot
2016-02-20 15:08:18 -05:00
parent 8383252286
commit fc468088c3
39 changed files with 511 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/TaskDuplication.php
View File

@@ -64,7 +64,7 @@ class TaskDuplication extends Base
if ($values['recurrence_status'] == Task::RECURRING_STATUS_PENDING) {
$values['recurrence_parent'] = $task_id;
$values['column_id'] = $this->board->getFirstColumn($values['project_id']);
$values['column_id'] = $this->column->getFirstColumnId($values['project_id']);
$this->calculateRecurringTaskDueDate($values);
$recurring_task_id = $this->save($task_id, $values);
@@ -181,12 +181,12 @@ class TaskDuplication extends Base
// Check if the column exists for the destination project
if ($values['column_id'] > 0) {
$values['column_id'] = $this->board->getColumnIdByTitle(
$values['column_id'] = $this->column->getColumnIdByTitle(
$values['project_id'],
$this->board->getColumnTitleById($values['column_id'])
$this->column->getColumnTitleById($values['column_id'])
);
$values['column_id'] = $values['column_id'] ?: $this->board->getFirstColumn($values['project_id']);
$values['column_id'] = $values['column_id'] ?: $this->column->getFirstColumnId($values['project_id']);
}
return $values;