Browse Source

Gii: renamed action "new" to "create"

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
3dbfd3ea0e
  1. 6
      framework/yii/gii/CodeFile.php
  2. 2
      framework/yii/gii/Generator.php
  3. 2
      framework/yii/gii/views/default/view/files.php

6
framework/yii/gii/CodeFile.php

@ -28,7 +28,7 @@ class CodeFile extends Object
/** /**
* The code file is new. * The code file is new.
*/ */
const OP_NEW = 'new'; const OP_CREATE = 'create';
/** /**
* The code file already exists, and the new one may need to overwrite it. * The code file already exists, and the new one may need to overwrite it.
*/ */
@ -68,7 +68,7 @@ class CodeFile extends Object
if (is_file($path)) { if (is_file($path)) {
$this->operation = file_get_contents($path) === $content ? self::OP_SKIP : self::OP_OVERWRITE; $this->operation = file_get_contents($path) === $content ? self::OP_SKIP : self::OP_OVERWRITE;
} else { } else {
$this->operation = self::OP_NEW; $this->operation = self::OP_CREATE;
} }
} }
@ -79,7 +79,7 @@ class CodeFile extends Object
public function save() public function save()
{ {
$module = Yii::$app->controller->module; $module = Yii::$app->controller->module;
if ($this->operation === self::OP_NEW) { if ($this->operation === self::OP_CREATE) {
$dir = dirname($this->path); $dir = dirname($this->path);
if (!is_dir($dir)) { if (!is_dir($dir)) {
$mask = @umask(0); $mask = @umask(0);

2
framework/yii/gii/Generator.php

@ -250,7 +250,7 @@ abstract class Generator extends Model
$hasError = true; $hasError = true;
$lines[] = "generating $relativePath\n<span class=\"error\">$error</span>"; $lines[] = "generating $relativePath\n<span class=\"error\">$error</span>";
} else { } else {
$lines[] = $file->operation === CodeFile::OP_NEW ? " generated $relativePath" : " overwrote $relativePath"; $lines[] = $file->operation === CodeFile::OP_CREATE ? " generated $relativePath" : " overwrote $relativePath";
} }
} else { } else {
$lines[] = " skipped $relativePath"; $lines[] = " skipped $relativePath";

2
framework/yii/gii/views/default/view/files.php

@ -53,7 +53,7 @@ use yii\gii\CodeFile;
if ($file->operation === CodeFile::OP_SKIP) { if ($file->operation === CodeFile::OP_SKIP) {
echo '&nbsp;'; echo '&nbsp;';
} else { } else {
echo Html::checkBox("answers[{$file->id}]", isset($answers) ? isset($answers[$file->id]) : ($file->operation === CodeFile::OP_NEW)); echo Html::checkBox("answers[{$file->id}]", isset($answers) ? isset($answers[$file->id]) : ($file->operation === CodeFile::OP_CREATE));
} }
?> ?>
</td> </td>

Loading…
Cancel
Save