Merge pull request #86 from skeeks-cms/fixed-admin-user-search

Fixed admin user search
skeeks-cms · Mar 14, 2018 · 98b04d6 · 98b04d6
2 parents 456f46b + 70f4fde
commit 98b04d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 CHANGELOG
 ==============
 
-5.0.2.pre
+5.0.3
+----------------
+ * Fixed admin user search
+
+5.0.2
 ----------------
  * Copy elements and move sections
  * "skeeks/yii2-form": "dev-master@dev"

diff --git a/src/models/searchs/CmsUserSearch.php b/src/models/searchs/CmsUserSearch.php
@@ -169,7 +169,9 @@ public function search($params)
         if ($this->q) {
             $query->andFilterWhere([
                 'or',
-                ['like', $this->tableName() . '.name', $this->q],
+                ['like', $this->tableName() . '.first_name', $this->q],
+                ['like', $this->tableName() . '.last_name', $this->q],
+                ['like', $this->tableName() . '.patronymic', $this->q],
                 ['like', $this->tableName() . '.email', $this->q],
                 ['like', $this->tableName() . '.phone', $this->q],
                 ['like', $this->tableName() . '.username', $this->q],

diff --git a/src/views/admin-user/_search.php b/src/views/admin-user/_search.php
@@ -44,7 +44,9 @@
     'size' => 1
 ]); ?>
 
-<?= $form->field($searchModel, 'name') ?>
+<?= $form->field($searchModel, 'first_name') ?>
+<?= $form->field($searchModel, 'last_name') ?>
+<?= $form->field($searchModel, 'patronymic') ?>
 <?= $form->field($searchModel, 'username') ?>
 <?= $form->field($searchModel, 'email') ?>
 <?= $form->field($searchModel, 'phone') ?>