Skip to content

Use model attributes instead of schema in CRUD generator #470

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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Use model attributes instead of schema in CRUD generator #470

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e4592d
Update index.php
WinterSilence Sep 25, 2021
1248fc2
Update index.php
WinterSilence Sep 26, 2021
8d504f8
Update index.php
WinterSilence Sep 26, 2021
c1471ae
Update src/generators/crud/default/views/index.php
samdark Sep 27, 2021
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
121 changes: 73 additions & 48 deletions src/generators/crud/default/views/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,104 @@
<?php

/**
* @var \yii\web\View $this
* @var \yii\gii\generators\crud\Generator $generator
*/

use yii\helpers\Inflector;
use yii\helpers\StringHelper;

/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\crud\Generator */
$php7 = PHP_MAJOR_VERSION === 7;
$modelClass = StringHelper::basename($generator->modelClass);
$modelName = Inflector::camel2words($modelClass);

echo "<?php\n";
?>

/**
* @var \yii\web\View $this
<?= !empty($generator->searchModelClass) ? ' * @var ' . $generator->searchModelClass . " \$searchModel\n" : '' ?>
* @var \yii\data\ActiveDataProvider $dataProvider
*/

use yii\helpers\Html;
use <?= $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
<?php if ($generator->indexWidgetType === 'grid'): ?>
use yii\helpers\Url;
use yii\grid\ActionColumn;
use yii\grid\GridView;
use yii\grid\SerialColumn;
<?php else: ?>
use yii\widgets\ListView;
<?php endif; ?>
use <?= $generator->modelClass ?>;
<?= $generator->enablePjax ? 'use yii\widgets\Pjax;' : '' ?>

/* @var $this yii\web\View */
<?= !empty($generator->searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
/* @var $dataProvider yii\data\ActiveDataProvider */

$this->title = <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
$this->title = <?= $generator->generateString(Inflector::pluralize($modelName)) ?>;
$this->params['breadcrumbs'][] = $this->title;

?>
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-index">
<div class="<?= Inflector::camel2id($modelClass) ?>-index">

<h1><?= "<?= " ?>Html::encode($this->title) ?></h1>
<h1><?= '<?= ' ?>Html::encode($this->title) ?></h1>

<p>
<?= "<?= " ?>Html::a(<?= $generator->generateString('Create ' . Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>, ['create'], ['class' => 'btn btn-success']) ?>
<p class="action-bar">
<?= '<?= ' ?>Html::a(<?= $generator->generateString('Create ' . $modelName) ?>, ['create'], ['class' => 'btn btn-success']) ?>
</p>

<?= $generator->enablePjax ? " <?php Pjax::begin(); ?>\n" : '' ?>
<?= $generator->enablePjax ? '<?php Pjax::begin(); ?>' : '' ?>

<?php if(!empty($generator->searchModelClass)): ?>
<?= " <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
<?= '<?php ' . ($generator->indexWidgetType === 'grid' ? '// ' : '') ?>echo $this->render('_search', ['model' => $searchModel]); ?>
<?php endif; ?>

<?php if ($generator->indexWidgetType === 'grid'): ?>
<?= "<?= " ?>GridView::widget([
<?= '<?= ' ?>GridView::widget([
'dataProvider' => $dataProvider,
<?= !empty($generator->searchModelClass) ? "'filterModel' => \$searchModel,\n 'columns' => [\n" : "'columns' => [\n"; ?>
['class' => 'yii\grid\SerialColumn'],

<?php
$count = 0;
if (($tableSchema = $generator->getTableSchema()) === false) {
foreach ($generator->getColumnNames() as $name) {
if (++$count < 6) {
echo " '" . $name . "',\n";
} else {
echo " //'" . $name . "',\n";
}
}
} else {
foreach ($tableSchema->columns as $column) {
$format = $generator->generateColumnFormat($column);
if (++$count < 6) {
echo " '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n";
} else {
echo " //'" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n";
}
}
}
?>

['class' => 'yii\grid\ActionColumn'],
],
<?= $generator->searchModelClass ? "'filterModel' => \$searchModel,\n" : ''; ?>
'columns' => [
['class' => SerialColumn::class<?= $php7 ? '' : 'Name()' ?>],
<?php
/** @var \yii\base\Model $model */
$model = \Yii::createObject($generator->modelClass);
$pk = $model instanceof \yii\db\ActiveRecord ? $model::primaryKey() : [];
$count = 1;
$tableSchema = $generator->getTableSchema();
$labels = $model->attributeLabels();
foreach ($model->attributes() as $attribute) {
if (in_array($attribute, $pk, true)) {
continue;
}
$format = 'text';
if ($tableSchema) {
$column = $tableSchema->getColumn($attribute);
$format = $generator->generateColumnFormat($column);
}
$label = isset($labels[$attribute]) ? $labels[$attribute] : Inflector::humanize($attribute);
echo sprintf(" %s'%s:%s:%s',\n", $count < 6 ? '' : '// ', $attribute, $format, $label);
$count++;
}
?>
[
'class' => ActionColumn::class<?= $php7 ? '' : 'Name()' ?>,
'urlCreator' => static function ($action, <?= $modelClass ?> $model/*, $key, $index, $column */) {
return Url::toRoute([$action, <?= $generator->generateUrlParams() ?>]);
}
]
]
]); ?>
<?php else: ?>
<?= "<?= " ?>ListView::widget([
<?= '<?= ' ?>ListView::widget([
'dataProvider' => $dataProvider,
'itemOptions' => ['class' => 'item'],
'itemView' => function ($model, $key, $index, $widget) {
return Html::a(Html::encode($model-><?= $generator->getNameAttribute() ?>), ['view', <?= $generator->generateUrlParams() ?>]);
},
]) ?>
'itemView' => static function (<?= $modelClass ?> $model/*, $key, $index, $widget */) {
return Html::a(
Html::encode($model-><?= $generator->getNameAttribute() ?>),
['view', <?= $generator->generateUrlParams() ?>]
);
}
]); ?>
<?php endif; ?>

<?= $generator->enablePjax ? " <?php Pjax::end(); ?>\n" : '' ?>
<?= $generator->enablePjax ? '<?php Pjax::end(); ?>' : '' ?>

</div>