diff options
| author | Frederic Guillot <fred@kanboard.net> | 2017-01-29 19:58:41 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2017-01-29 19:58:41 -0500 |
| commit | 7056935d844f6e43fc8da795829903d2bd2936b1 (patch) | |
| tree | 6a124b20730b8dda5fa357f1168de10e66c1ae00 /app | |
| parent | 66ced63fe263b158707b65b4bd691fa46658828c (diff) | |
| parent | f392d38e723a51c38da3a938b77822147447676e (diff) | |
Solve conflicts in PR #2431
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/TaskBulkController.php | 2 | ||||
| -rw-r--r-- | app/Controller/TaskCreationController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Controller/TaskBulkController.php b/app/Controller/TaskBulkController.php index 4e06f636..51447f32 100644 --- a/app/Controller/TaskBulkController.php +++ b/app/Controller/TaskBulkController.php @@ -32,7 +32,7 @@ class TaskBulkController extends BaseController 'project' => $project, 'values' => $values, '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(), 'categories_list' => $this->categoryModel->getList($project['id']), ))); diff --git a/app/Controller/TaskCreationController.php b/app/Controller/TaskCreationController.php index 20457568..cafd7e06 100644 --- a/app/Controller/TaskCreationController.php +++ b/app/Controller/TaskCreationController.php @@ -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, ))); |