leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #526 from liviuk2/master

Browse Source 
UserSearch avoid fields name conflict if joined with other tables
This commit is contained in:
Lorenzo Milesi
2023-12-15 12:30:27 +01:00
committed by GitHub
parent 739c0cad41 214eef6f16
commit cb93930962
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- Fix: Two Factor Authentication - Filter - Blocks even when two factor authentication is enabled - Fix: Two Factor Authentication - Filter - Blocks even when two factor authentication is enabled
- Fix: update Dutch (nl) translations (squio) - Fix: update Dutch (nl) translations (squio)
- Enh: possibility to limit the depth of the recursion when getting user ids from roles (mp1509) - Enh: possibility to limit the depth of the recursion when getting user ids from roles (mp1509)
- Fix: UserSearch avoid fields name conflict if joined with other tables (liviuk2)
## 1.6.1 March 4th, 2023 ## 1.6.1 March 4th, 2023

18
src/User/Search/UserSearch.php
View File

@ -11,7 +11,9 @@
namespace Da\User\Search; namespace Da\User\Search;
use Da\User\Model\User;
use Da\User\Query\UserQuery; use Da\User\Query\UserQuery;
use Da\User\Traits\ContainerAwareTrait;
use Yii; use Yii;
use yii\base\InvalidParamException; use yii\base\InvalidParamException;
use yii\base\Model; use yii\base\Model;
@ -19,6 +21,8 @@ use yii\data\ActiveDataProvider;
class UserSearch extends Model class UserSearch extends Model
{ {
use ContainerAwareTrait;
/** /**
* @var string * @var string
*/ */
@ -106,21 +110,23 @@ class UserSearch extends Model
return $dataProvider; return $dataProvider;
} }
$userClass = $this->getClassMap()->get(User::class);
if ($this->created_at !== null) { if ($this->created_at !== null) {
$date = strtotime($this->created_at); $date = strtotime($this->created_at);
$query->andFilterWhere(['between', 'created_at', $date, $date + 3600 * 24]); $query->andFilterWhere(['between', $userClass::tableName().'.created_at', $date, $date + 3600 * 24]);
} }
if ($this->last_login_at !== null) { if ($this->last_login_at !== null) {
$date = strtotime($this->last_login_at); $date = strtotime($this->last_login_at);
$query->andFilterWhere(['between', 'last_login_at', $date, $date + 3600 * 24]); $query->andFilterWhere(['between', $userClass::tableName().'.last_login_at', $date, $date + 3600 * 24]);
} }
$query $query
->andFilterWhere(['like', 'username', $this->username]) ->andFilterWhere(['like', $userClass::tableName().'.username', $this->username])
->andFilterWhere(['like', 'email', $this->email]) ->andFilterWhere(['like', $userClass::tableName().'.email', $this->email])
->andFilterWhere(['registration_ip' => $this->registration_ip]) ->andFilterWhere([$userClass::tableName().'.registration_ip' => $this->registration_ip])
->andFilterWhere(['last_login_ip' => $this->last_login_ip]); ->andFilterWhere([$userClass::tableName().'.last_login_ip' => $this->last_login_ip]);
return $dataProvider; return $dataProvider;
} }