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

Add user backend provider system

Browse Source
This commit is contained in:
Frederic Guillot
2017-11-09 15:09:54 -08:00
parent 95b2a36886
commit 44aa24bab1
23 changed files with 273 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/ProjectPermissionController.php
View File

@@ -69,6 +69,10 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$values = $this->request->getValues();
if (empty($values['user_id']) && ! empty($values['external_id']) && ! empty($values['external_id_column'])) {
$values['user_id'] = $this->userModel->getOrCreateExternalUserId($values['username'], $values['name'], $values['external_id_column'], $values['external_id']);
}
if (empty($values['user_id'])) {
$this->flash->failure(t('User not found.'));
} elseif ($this->projectUserRoleModel->addUser($values['project_id'], $values['user_id'], $values['role'])) {

12
app/Controller/UserAjaxController.php
View File

@@ -2,9 +2,6 @@
namespace Kanboard\Controller;
use Kanboard\Filter\UserNameFilter;
use Kanboard\Model\UserModel;
/**
* User Ajax Controller
*
@@ -21,13 +18,8 @@ class UserAjaxController extends BaseController
public function autocomplete()
{
$search = $this->request->getStringParam('term');
$filter = $this->userQuery->withFilter(new UserNameFilter($search));
$filter->getQuery()
->eq(UserModel::TABLE.'.is_active', 1)
->asc(UserModel::TABLE.'.name')
->asc(UserModel::TABLE.'.username');
$this->response->json($filter->format($this->userAutoCompleteFormatter));
$users = $this->userManager->find($search);
$this->response->json($this->userAutoCompleteFormatter->withUsers($users)->format());
}
/**