Adding desired traits to base model class

schmunk42 · Feb 23, 2015 · 492fcb9 · 492fcb9
1 parent c267a25
commit 492fcb9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/fullModel/FullModelCode.php b/fullModel/FullModelCode.php
@@ -6,6 +6,7 @@ class FullModelCode extends ModelCode
 {
     public $tables;
     public $baseClass = 'CActiveRecord';
+    public $baseClassTraits = '';
     public $messageCatalog = 'model';
     public $generateModel = true;
 
@@ -31,10 +32,19 @@ public function rules()
                      'pattern' => '/^[a-zA-Z_][\w.]*$/',
                      'message' => '{attribute} should only contain word characters.'
                  ),
+    		    array('baseClassTraits', 'match', 'pattern'=>'/^[a-zA-Z_\\\\][\w\\\\,]*$/', 'message'=>'{attribute} should only contain word characters, commas and backslashes.'),
+    		    array('baseClassTraits', 'safe'),
             )
         );
     }
 
+	public function attributeLabels()
+	{
+		return array_merge(parent::attributeLabels(), array(
+			'baseClassTraits'=>'Base Class Traits',
+		));
+	}
+
     public function prepare()
     {
         parent::prepare();
@@ -72,6 +82,7 @@ public function prepare()
             $params = array(
                 'tableName'  => $schema === '' ? $tableName : $schema . '.' . $tableName,
                 'modelClass' => $className,
+                'baseClassTraits' => $this->baseClassTraits,
                 'columns'    => $table->columns,
                 'labels'     => $this->generateLabels($table),
                 'rules'      => $this->generateRules($table),

diff --git a/fullModel/templates/default/basemodel.php b/fullModel/templates/default/basemodel.php
@@ -57,6 +57,14 @@
 abstract class <?php echo 'Base' . $modelClass; ?> extends <?php echo $this->baseClass."\n"; ?>
 {
 <?php
+if (!empty($this->baseClassTraits)) {
+    echo "\n";
+    foreach(explode(",", $this->baseClassTraits) as $traitName) {
+        echo '    use '.$traitName.';' . "\n";
+    }
+}
+?>
+<?php
 if(!empty($enum)){
 ?>
     /**

diff --git a/fullModel/views/index.php b/fullModel/views/index.php
@@ -137,6 +137,14 @@
     </div>
     <?php echo $form->error($model, 'baseClass'); ?>
 </div>
+<div class="row sticky">
+    <?php echo $form->labelEx($model, 'baseClassTraits'); ?>
+    <?php echo $form->textField($model, 'baseClassTraits', array('size' => 65)); ?>
+    <div class="tooltip">
+        Comma-separated list of traits for base class to use.
+    </div>
+    <?php echo $form->error($model, 'baseClassTraits'); ?>
+</div>
 <div class="row sticky">
     <?php echo $form->labelEx($model, 'modelPath'); ?>
     <?php echo $form->textField($model, 'modelPath', array('size' => 65)); ?>