php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-09 09:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1107: if basename of Gii CRUD model and search model are equal than alias is automatically used for search model

Browse Source
This commit is contained in:
Alexander Makarov
2013-11-01 13:23:05 +04:00
parent eeed9c3ff2
commit 1b497ad73b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/yii/gii/generators/crud/templates/controller.php
View File

@ -12,6 +12,9 @@ use yii\helpers\StringHelper;
$controllerClass = StringHelper::basename($generator->controllerClass); $controllerClass = StringHelper::basename($generator->controllerClass);
$modelClass = StringHelper::basename($generator->modelClass); $modelClass = StringHelper::basename($generator->modelClass);
$searchModelClass = StringHelper::basename($generator->searchModelClass); $searchModelClass = StringHelper::basename($generator->searchModelClass);
if ($modelClass === $searchModelClass) {
$searchModelAlias = $searchModelClass.'Search';
}
$pks = $generator->getTableSchema()->primaryKey; $pks = $generator->getTableSchema()->primaryKey;
$urlParams = $generator->generateUrlParams(); $urlParams = $generator->generateUrlParams();
@ -24,7 +27,7 @@ echo "<?php\n";
namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>; namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
use <?= ltrim($generator->modelClass, '\\') ?>; use <?= ltrim($generator->modelClass, '\\') ?>;
use <?= ltrim($generator->searchModelClass, '\\') ?>; use <?= ltrim($generator->searchModelClass, '\\') ?><?php if (isset($searchModelAlias)):?> as <?= $searchModelAlias ?><?php endif ?>;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use <?= ltrim($generator->baseControllerClass, '\\') ?>; use <?= ltrim($generator->baseControllerClass, '\\') ?>;
use yii\web\HttpException; use yii\web\HttpException;
@ -53,7 +56,7 @@ class <?= $controllerClass ?> extends <?= StringHelper::basename($generator->bas
*/ */
public function actionIndex() public function actionIndex()
{ {
$searchModel = new <?= $searchModelClass ?>; $searchModel = new <?= isset($searchModelAlias) ? $searchModelAlias : $searchModelClass ?>;
$dataProvider = $searchModel->search($_GET); $dataProvider = $searchModel->search($_GET);
return $this->render('index', [ return $this->render('index', [