From 79d398fbb661ac85bdd2e9728b02711a376ad75d Mon Sep 17 00:00:00 2001 From: Dmitriy Gritsenko Date: Wed, 25 Dec 2024 17:38:14 +0500 Subject: [PATCH 1/6] New feature for the issue #551 --- src/generators/crud/default/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generators/crud/default/search.php b/src/generators/crud/default/search.php index 81654b3b0..80f86a6c8 100644 --- a/src/generators/crud/default/search.php +++ b/src/generators/crud/default/search.php @@ -60,7 +60,7 @@ public function scenarios() * * @return ActiveDataProvider */ - public function search($params) + public function search($params, $formName = '') { $query = ::find(); @@ -70,7 +70,7 @@ public function search($params) 'query' => $query, ]); - $this->load($params); + $this->load($params, $formName); if (!$this->validate()) { // uncomment the following line if you do not want to return any records when validation fails From 6475855fc5a4d1650a084bdcb9ea934183e1daa8 Mon Sep 17 00:00:00 2001 From: Dmitriy Gritsenko Date: Wed, 25 Dec 2024 17:44:21 +0500 Subject: [PATCH 2/6] New feature for the issue #551 --- src/generators/crud/default/search.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/generators/crud/default/search.php b/src/generators/crud/default/search.php index 80f86a6c8..b5e7d601a 100644 --- a/src/generators/crud/default/search.php +++ b/src/generators/crud/default/search.php @@ -57,6 +57,7 @@ public function scenarios() * Creates data provider instance with search query applied * * @param array $params + * @param string $formName Form name to be used into `->load()` method. By default it is equal to the class name. * * @return ActiveDataProvider */ From 126eb7bdbaf7c71881e1eb0b5cd4045ab80d1c7a Mon Sep 17 00:00:00 2001 From: Dmitriy Gritsenko Date: Thu, 26 Dec 2024 14:25:43 +0500 Subject: [PATCH 3/6] Chnagelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2922ef42..5995075f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Yii Framework 2 gii extension Change Log 2.2.7 under development ----------------------- - +- Bug #551: Add optional parameter `$formName` to `SearchModel::search()` method (evil1) - Bug #531: Fix `yii\gii\console\GenerateAction` to use `stdout()` instead of echoing the output (egmsystems) - Bug #532: Return `ExitCode::USAGE` on command input validation error (egmsystems) - Enh #537: Generating rules for the fields with default values (manky) From 6c440dda3bc2d1f6ed475ee47ad3fa49a6fbf8bb Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 26 Dec 2024 17:05:36 +0300 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5995075f1..235ff243d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Yii Framework 2 gii extension Change Log 2.2.7 under development ----------------------- -- Bug #551: Add optional parameter `$formName` to `SearchModel::search()` method (evil1) +- Enh #551: Add optional parameter `$formName` to `SearchModel::search()` method (evil1) - Bug #531: Fix `yii\gii\console\GenerateAction` to use `stdout()` instead of echoing the output (egmsystems) - Bug #532: Return `ExitCode::USAGE` on command input validation error (egmsystems) - Enh #537: Generating rules for the fields with default values (manky) From d480ab82e27610624049f3daae56a8140bd4ef76 Mon Sep 17 00:00:00 2001 From: Dmitriy Gritsenko Date: Sat, 4 Jan 2025 19:27:40 +0500 Subject: [PATCH 5/6] Changelog update --- src/generators/crud/default/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generators/crud/default/search.php b/src/generators/crud/default/search.php index b5e7d601a..01e58d179 100644 --- a/src/generators/crud/default/search.php +++ b/src/generators/crud/default/search.php @@ -57,11 +57,11 @@ public function scenarios() * Creates data provider instance with search query applied * * @param array $params - * @param string $formName Form name to be used into `->load()` method. By default it is equal to the class name. + * @param string $formName Form name to be used into `->load()` method. * * @return ActiveDataProvider */ - public function search($params, $formName = '') + public function search($params, $formName = null) { $query = ::find(); From 8728c3f6d0616cec2cc795e41f81cb71f0d986d5 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Mon, 6 Jan 2025 10:28:33 +0300 Subject: [PATCH 6/6] Update src/generators/crud/default/search.php Co-authored-by: Robert Korulczyk --- src/generators/crud/default/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generators/crud/default/search.php b/src/generators/crud/default/search.php index 01e58d179..7cab720fd 100644 --- a/src/generators/crud/default/search.php +++ b/src/generators/crud/default/search.php @@ -57,7 +57,7 @@ public function scenarios() * Creates data provider instance with search query applied * * @param array $params - * @param string $formName Form name to be used into `->load()` method. + * @param string|null $formName Form name to be used into `->load()` method. * * @return ActiveDataProvider */