* [MOD] Improved behavior when searching for user permission on accounts. Thanks to @anth69 for the feedback. Closes #1338

* [MOD] Updated translations. Thanks to all contributors.

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2019-05-25 00:29:02 +02:00
parent ea9b6ee1fd
commit 4da57f86fb
9 changed files with 4223 additions and 4861 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -298,11 +298,11 @@ final class AccountSearchService extends Service
if (is_object($userData)) {
$queryCondition->addFilter(
'Account.userId = ? OR Account.id IN
'Account.userId = ? OR Account.userGroupId = ? OR Account.id IN
(SELECT AccountToUser.accountId FROM AccountToUser WHERE AccountToUser.accountId = Account.id AND AccountToUser.userId = ?
UNION ALL
UNION
SELECT AccountToUserGroup.accountId FROM AccountToUserGroup WHERE AccountToUserGroup.accountId = Account.id AND AccountToUserGroup.userGroupId = ?)',
[$userData->getId(), $userData->getId(), $userData->getUserGroupId()]);
[$userData->getId(), $userData->getUserGroupId(), $userData->getId(), $userData->getUserGroupId()]);
}
break;
case 'owner':