Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-13 11:57:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Pager was not displayed on auth tokens list

Browse Source 
* [ADD] Added special filters for account searching on management tab
* [MOD] Code refactoring

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-10-11 01:04:35 +02:00
parent 3dfe81b2eb
commit 33ae422b2f
74 changed files with 1551 additions and 1272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/SP/Repositories/User/UserRepository.php
View File

@@ -379,36 +379,39 @@ final class UserRepository extends Repository implements RepositoryItemInterface
public function search(ItemSearchData $itemSearchData)
{
$queryData = new QueryData();
$queryData->setSelect('U.id,
U.name,
U.login,
UP.name AS userProfileName,
UG.name AS userGroupName,
U.isAdminApp,
U.isAdminAcc,
U.isLdap,
U.isDisabled,
U.isChangePass');
$queryData->setFrom('User U INNER JOIN UserProfile UP ON U.userProfileId = UP.id INNER JOIN UserGroup UG ON U.userGroupId = UG.id');
$queryData->setOrder('U.name');
$queryData->setSelect('User.id,
User.name,
User.login,
UserProfile.name AS userProfileName,
UserGroup.name AS userGroupName,
User.isAdminApp,
User.isAdminAcc,
User.isLdap,
User.isDisabled,
User.isChangePass');
$queryData->setFrom('User
INNER JOIN UserProfile ON User.userProfileId = UserProfile.id
INNER JOIN UserGroup ON User.userGroupId = UserGroup.id');
$queryData->setOrder('User.name');
if ($itemSearchData->getSeachString() !== '') {
if ($this->context->getUserData()->getIsAdminApp()) {
$queryData->setWhere('U.name LIKE ? OR U.login LIKE ?');
$queryData->setWhere('User.name LIKE ? OR User.login LIKE ?');
} else {
$queryData->setWhere('U.name LIKE ? OR U.login LIKE ? AND U.isAdminApp = 0');
$queryData->setWhere('User.name LIKE ? OR User.login LIKE ? AND User.isAdminApp = 0');
}
$search = '%' . $itemSearchData->getSeachString() . '%';
$queryData->addParam($search);
$queryData->addParam($search);
} elseif (!$this->context->getUserData()->getIsAdminApp()) {
$queryData->setWhere('U.isAdminApp = 0');
$queryData->setWhere('User.isAdminApp = 0');
}
$queryData->setLimit('?, ?');
$queryData->addParam($itemSearchData->getLimitStart());
$queryData->addParam($itemSearchData->getLimitCount());
$queryData->setLimit(
'?,?',
[$itemSearchData->getLimitStart(), $itemSearchData->getLimitCount()]
);
return $this->db->doSelect($queryData, true);
}