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

Fix: Use humhub\modules\user\components\ActiveQueryUser::active() on UserPicker fillquery by default

Browse Source
This commit is contained in:
buddh4 2019-02-08 16:45:55 +01:00
parent 2714e48e4a
commit 7680f75efe
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/humhub/docs/CHANGELOG.md
View File

@ -19,6 +19,8 @@ HumHub Change Log
- Fix #3452: Soft deleted user remain in other users as friends
- Fix #3170: Wrong cancel invitation mail handling
- Enh: Added `humhub\modules\space\models\Membership::isCurrentUser()`
- Enh: Added `humhub\widgets\Link::post()` for `data-method="POST` requests
- Fix: Use `humhub\modules\user\components\ActiveQueryUser::active()` on UserPicker fillquery by default
1.3.8 (December 10, 2018)

23
protected/humhub/modules/user/models/UserPicker.php
View File

@ -15,29 +15,30 @@ use humhub\modules\user\models\UserFilter;
*/
class UserPicker
{
/**
* Creates a json user array used in the userpicker js frontend.
* The $cfg is used to specify the filter values the following values are available:
*
*
* query - (ActiveQuery) The initial query which is used to append additional filters. - default = User Friends if friendship module is enabled else User::find()
*
*
* active - (boolean) Specifies if only active user should be included in the result - default = true
*
*
* maxResults - (int) The max number of entries returned in the array - default = 10
*
*
* keyword - (string) A keyword which filters user by username, firstname, lastname, email and title
*
*
* permission - (BasePermission) An additional permission filter
*
*
* fillQuery - (ActiveQuery) Can be used to fill the result array if the initial query does not return the maxResults, these results will have a lower priority
*
*
* fillUser - (boolean) When set to true and no fillQuery is given the result is filled with User::find() results
*
*
* disableFillUser - Specifies if the results of the fillQuery should be disabled in the userpicker results - default = true
*
*
* @param type $cfg filter configuration
* @return type json representation used by the userpicker
* @throws \Throwable
*/
public static function filter($cfg = null)
{
@ -70,7 +71,7 @@ class UserPicker
if(count($user) < $cfg['maxResult'] && (isset($cfg['fillQuery']) || $cfg['fillUser']) ) {
//Filter out users by means of the fillQuery or default the fillQuery
$fillQuery = (isset($cfg['fillQuery'])) ? $cfg['fillQuery'] : UserFilter::find();
$fillQuery = (isset($cfg['fillQuery'])) ? $cfg['fillQuery'] : UserFilter::find()->active();
UserFilter::addKeywordFilter($fillQuery, $cfg['keyword'], ($cfg['maxResult'] - count($user)));
$fillQuery->andFilterWhere(['not in', 'id', self::getUserIdArray($user)]);
$fillUser = $fillQuery->all();