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

Solve conflicts in PR #2431

Browse Source
This commit is contained in:
Frederic Guillot
2017-01-29 19:58:41 -05:00
parent 66ced63fe2 f392d38e72
commit 7056935d84
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/TaskBulkController.php
View File

@@ -32,7 +32,7 @@ class TaskBulkController extends BaseController
'project' => $project, 'project' => $project,
'values' => $values, 'values' => $values,
'errors' => $errors, 'errors' => $errors,
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true), 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, $project['is_private']),
'colors_list' => $this->colorModel->getList(), 'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']), 'categories_list' => $this->categoryModel->getList($project['id']),
))); )));

2
app/Controller/TaskCreationController.php
View File

@@ -34,7 +34,7 @@ class TaskCreationController extends BaseController
'errors' => $errors, 'errors' => $errors,
'values' => $values + array('project_id' => $project['id']), 'values' => $values + array('project_id' => $project['id']),
'columns_list' => $this->columnModel->getList($project['id']), 'columns_list' => $this->columnModel->getList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true), 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, $project['is_private']),
'categories_list' => $this->categoryModel->getList($project['id']), 'categories_list' => $this->categoryModel->getList($project['id']),
'swimlanes_list' => $swimlanes_list, 'swimlanes_list' => $swimlanes_list,
))); )));