Solve conflicts in PR #2431
This commit is contained in:
@@ -34,7 +34,7 @@ class TaskCreationController extends BaseController
|
||||
'errors' => $errors,
|
||||
'values' => $values + array('project_id' => $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']),
|
||||
'swimlanes_list' => $swimlanes_list,
|
||||
)));
|
||||
|
||||
Reference in New Issue
Block a user