diff --git a/extensions/gii/generators/crud/Generator.php b/extensions/gii/generators/crud/Generator.php index f2bad29..0294fb2 100644 --- a/extensions/gii/generators/crud/Generator.php +++ b/extensions/gii/generators/crud/Generator.php @@ -400,10 +400,10 @@ class Generator extends \yii\gii\Generator case Schema::TYPE_TIME: case Schema::TYPE_DATETIME: case Schema::TYPE_TIMESTAMP: - $conditions[] = "\$this->addFilter(\$query, '{$column}');"; + $conditions[] = "\$query->andFilter(['{$column}' => \$this->{$column}]);"; break; default: - $conditions[] = "\$this->addFilter(\$query, '{$column}', true);"; + $conditions[] = "\$this->addFilter(['like', '{$column}', \$this->{$column}]);"; break; } } diff --git a/extensions/gii/generators/crud/default/search.php b/extensions/gii/generators/crud/default/search.php index c797907..2c5754f 100644 --- a/extensions/gii/generators/crud/default/search.php +++ b/extensions/gii/generators/crud/default/search.php @@ -70,23 +70,4 @@ class extends Model return $dataProvider; } - - protected function addCondition($query, $attribute, $partialMatch = false) - { - if (($pos = strrpos($attribute, '.')) !== false) { - $modelAttribute = substr($attribute, $pos + 1); - } else { - $modelAttribute = $attribute; - } - - $value = $this->$modelAttribute; - if (trim($value) === '') { - return; - } - if ($partialMatch) { - $query->andWhere(['like', $attribute, $value]); - } else { - $query->andWhere([$attribute => $value]); - } - } }