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

Merge pull request #2719 from klevron/2712

Browse Source 
Fix #2712
This commit is contained in:
Alexander Makarov
2014-03-12 18:18:37 +03:00
parent 466e2600ad 0b92f270de
commit f7a859f522
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/gii/CHANGELOG.md
View File

@@ -7,6 +7,7 @@ Yii Framework 2 gii extension Change Log
- Bug #1405: fixed disambiguation of relation names generated by gii (qiangxue) - Bug #1405: fixed disambiguation of relation names generated by gii (qiangxue)
- Bug #1904: Fixed autocomplete to work with underscore inputs "_" (tonydspaniard) - Bug #1904: Fixed autocomplete to work with underscore inputs "_" (tonydspaniard)
- Bug #2298: Fixed the bug that Gii controller generator did not allow digit in the controller ID (qiangxue) - Bug #2298: Fixed the bug that Gii controller generator did not allow digit in the controller ID (qiangxue)
- Bug #2712: Fixed missing id in code file preview url (klevron)
- Bug: fixed controller in crud template to avoid returning query in findModel() (cebe) - Bug: fixed controller in crud template to avoid returning query in findModel() (cebe)
- Enh #1624: generate rules for unique indexes (lucianobaraglia) - Enh #1624: generate rules for unique indexes (lucianobaraglia)
- Enh #1818: Do not display checkbox column if all rows are empty (johonunu) - Enh #1818: Do not display checkbox column if all rows are empty (johonunu)

1
extensions/gii/views/default/view.php
View File

@@ -62,6 +62,7 @@ foreach ($generator->templates as $name => $path) {
]); ]);
} elseif (isset($files)) { } elseif (isset($files)) {
echo $this->render('view/files', [ echo $this->render('view/files', [
'id' => $id,
'generator' => $generator, 'generator' => $generator,
'files' => $files, 'files' => $files,
'answers' => $answers, 'answers' => $answers,

2
extensions/gii/views/default/view/files.php
View File

@@ -46,7 +46,7 @@ use yii\gii\CodeFile;
?> ?>
<tr class="<?= "$file->operation $trClass" ?>"> <tr class="<?= "$file->operation $trClass" ?>">
<td class="file"> <td class="file">
<?= Html::a(Html::encode($file->getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]) ?> <?= Html::a(Html::encode($file->getRelativePath()), ['preview', 'id'=>$id, 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]) ?>
<?php if ($file->operation === CodeFile::OP_OVERWRITE): ?> <?php if ($file->operation === CodeFile::OP_OVERWRITE): ?>
<?= Html::a('diff', ['diff', 'file' => $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]) ?> <?= Html::a('diff', ['diff', 'file' => $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]) ?>
<?php endif; ?> <?php endif; ?>