mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 06:08:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix people sorting by "Default" when filter "Group" is selected (#5111)

Browse Source
This commit is contained in:
Yuriy Bakhtin 2021-06-09 11:23:59 +03:00 committed by GitHub
parent 5b02fff527
commit 17ffa49f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protected/humhub/modules/user/components/PeopleQuery.php
View File

@ -211,8 +211,8 @@ class PeopleQuery extends ActiveQueryUser
if (empty($defaultSortingGroupId)) {
$this->addOrderBy('last_login DESC');
} else {
$this->leftJoin('group_user', 'group_user.user_id = user.id AND group_user.group_id = :defaultGroupId', [':defaultGroupId' => $defaultSortingGroupId]);
$this->addOrderBy('group_user.group_id DESC, last_login DESC');
$this->leftJoin('group_user AS top_group_sorting', 'top_group_sorting.user_id = user.id AND top_group_sorting.group_id = :defaultGroupId', [':defaultGroupId' => $defaultSortingGroupId]);
$this->addOrderBy('top_group_sorting.group_id DESC, last_login DESC');
}
}