Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support filtering with operators in GridView filter values #43

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support filtering with operators in GridView filter values #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dee48a6
Support filtering with operators in GridView filter values
lennartvdd May 22, 2015
2365dfc
Update CHANGELOG.md
lennartvdd May 22, 2015
3df896a
Update CHANGELOG.md
lennartvdd May 23, 2015
70f5e92
Merge branch 'master' of github.com:yiisoft/yii2-gii into queryCompare
lennartvdd Jun 2, 2015
85a51bc
Update CHANGELOG.md [skip ci]
lennartvdd Jun 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Yii Framework 2 gii extension Change Log
2.0.5 under development
-----------------------

- Enh: #42: Entire preview code now can be copied by pressing CTRL+C (thiagotalma, samdark)
- Enh #42: Entire preview code now can be copied by pressing CTRL+C (thiagotalma, samdark)
- Enh #2022: Added support for GridView filtering on values starting with basic operators to CRUD Generator (lennartvdd)
- Chg #38: Added compatibility with latest Typeahead version (razvanphp)


2.0.4 May 10, 2015
------------------

Expand Down
14 changes: 8 additions & 6 deletions generators/crud/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,16 @@ public function generateSearchConditions()
}
}

$likeConditions = [];
$compareConditions = [];
$hashConditions = [];
foreach ($columns as $column => $type) {
switch ($type) {
case Schema::TYPE_BOOLEAN:
$hashConditions[] = "'{$column}' => \$this->{$column},";
break;
case Schema::TYPE_SMALLINT:
case Schema::TYPE_INTEGER:
case Schema::TYPE_BIGINT:
case Schema::TYPE_BOOLEAN:
case Schema::TYPE_FLOAT:
case Schema::TYPE_DOUBLE:
case Schema::TYPE_DECIMAL:
Expand All @@ -413,10 +415,10 @@ public function generateSearchConditions()
case Schema::TYPE_TIME:
case Schema::TYPE_DATETIME:
case Schema::TYPE_TIMESTAMP:
$hashConditions[] = "'{$column}' => \$this->{$column},";
$compareConditions[] = "->andFilterCompare('{$column}', \$this->{$column})";
break;
default:
$likeConditions[] = "->andFilterWhere(['like', '{$column}', \$this->{$column}])";
$compareConditions[] = "->andFilterCompare('{$column}', \$this->{$column}, 'like')";
break;
}
}
Expand All @@ -427,8 +429,8 @@ public function generateSearchConditions()
. str_repeat(' ', 12) . implode("\n" . str_repeat(' ', 12), $hashConditions)
. "\n" . str_repeat(' ', 8) . "]);\n";
}
if (!empty($likeConditions)) {
$conditions[] = "\$query" . implode("\n" . str_repeat(' ', 12), $likeConditions) . ";\n";
if (!empty($compareConditions)) {
$conditions[] = "\$query" . implode("\n" . str_repeat(' ', 12), $compareConditions) . ";\n";
}

return $conditions;
Expand Down