From d7c1010e201a8ddccd3040e2a5d2c96ecd8e507a Mon Sep 17 00:00:00 2001
From: "qiang.xue" <qiang.xue@c7f931c7-7552-0410-b027-2fb3d89d9100>
Date: Mon, 5 Apr 2010 02:43:41 +0000
Subject: [PATCH]

---
 framework/gii/generators/model/ModelCode.php  | 16 +++++++-----
 .../model/templates/default/model.php         | 26 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/framework/gii/generators/model/ModelCode.php b/framework/gii/generators/model/ModelCode.php
index 44b8b5d8b..91a93d67e 100644
--- a/framework/gii/generators/model/ModelCode.php
+++ b/framework/gii/generators/model/ModelCode.php
@@ -53,9 +53,18 @@ class ModelCode extends CCodeModel
 		$this->files=array();
 		$templatePath=$this->templatePath;
 
+		$params=array(
+			'tableName'=>$this->removePrefix($this->tableName),
+			'modelClass'=>$this->modelClass,
+			'columns'=>$this->getColumns(),
+			'labels'=>$this->getLabels(),
+			'rules'=>$this->getRules(),
+			'relations'=>$this->getRelations(),
+		);
+
 		$this->files[]=new CCodeFile(
 			Yii::getPathOfAlias($this->modelPath).'/'.$this->modelClass.'.php',
-			$this->render($templatePath.'/model.php')
+			$this->render($templatePath.'/model.php', $params)
 		);
 	}
 
@@ -161,11 +170,6 @@ class ModelCode extends CCodeModel
 		return isset($relations[$this->modelClass]) ? $relations[$this->modelClass] : array();
 	}
 
-	public function getTableNameWithoutPrefix()
-	{
-		return $this->removePrefix($this->tableName);
-	}
-
 	protected function removePrefix($tableName,$addBrackets=true)
 	{
 		$prefix=$this->tablePrefix!='' ? $this->tablePrefix : Yii::app()->db->tablePrefix;
diff --git a/framework/gii/generators/model/templates/default/model.php b/framework/gii/generators/model/templates/default/model.php
index 8c10260c3..936407909 100644
--- a/framework/gii/generators/model/templates/default/model.php
+++ b/framework/gii/generators/model/templates/default/model.php
@@ -2,18 +2,24 @@
 /**
  * This is the template for generating the model class of a specified table.
  * - $this: the CrudCode object
+ * - $tableName: the table name for this class (prefix is already removed if necessary)
+ * - $modelClass: the model class name
+ * - $columns: list of table columns (name=>CDbColumnSchema)
+ * - $labels: list of attribute labels (name=>label)
+ * - $rules: list of validation rules
+ * - $relations: list of relations (name=>relation declaration)
  */
 ?>
 <?php echo "<?php\n"; ?>
 
 /**
- * This is the model class for table "<?php echo $this->tableNameWithoutPrefix; ?>".
+ * This is the model class for table "<?php echo $tableName; ?>".
  */
-class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n"; ?>
+class <?php echo $modelClass; ?> extends <?php echo $this->baseClass."\n"; ?>
 {
 	/**
-	 * The followings are the available columns in table '<?php echo $this->tableNameWithoutPrefix; ?>':
-<?php foreach($this->getColumns() as $column): ?>
+	 * The followings are the available columns in table '<?php echo $tableName; ?>':
+<?php foreach($columns as $column): ?>
 	 * @var <?php echo $column->type.' $'.$column->name."\n"; ?>
 <?php endforeach; ?>
 	 */
@@ -32,7 +38,7 @@ class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n";
 	 */
 	public function tableName()
 	{
-		return '<?php echo $this->tableNameWithoutPrefix; ?>';
+		return '<?php echo $tableName; ?>';
 	}
 
 	/**
@@ -43,12 +49,12 @@ class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n";
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-<?php foreach($this->getRules() as $rule): ?>
+<?php foreach($rules as $rule): ?>
 			<?php echo $rule.",\n"; ?>
 <?php endforeach; ?>
 			// The following rule is used by search().
 			// Please remove those attributes that should not be searched.
-			array('<?php echo implode(', ', array_keys($this->getColumns())); ?>', 'safe', 'on'=>'search'),
+			array('<?php echo implode(', ', array_keys($columns)); ?>', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -60,7 +66,7 @@ class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n";
 		// NOTE: you may need to adjust the relation name and the related
 		// class name for the relations automatically generated below.
 		return array(
-<?php foreach($this->getRelations() as $name=>$relation): ?>
+<?php foreach($relations as $name=>$relation): ?>
 			<?php echo "'$name' => $relation,\n"; ?>
 <?php endforeach; ?>
 		);
@@ -72,7 +78,7 @@ class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n";
 	public function attributeLabels()
 	{
 		return array(
-<?php foreach($this->getLabels() as $name=>$label): ?>
+<?php foreach($labels as $name=>$label): ?>
 			<?php echo "'$name' => '$label',\n"; ?>
 <?php endforeach; ?>
 		);
@@ -90,7 +96,7 @@ class <?php echo $this->modelClass; ?> extends <?php echo $this->baseClass."\n";
 		$criteria=new CDbCriteria;
 
 <?php
-foreach($this->getColumns() as $name=>$column)
+foreach($columns as $name=>$column)
 {
 	if($column->type==='string')
 	{