crud wip

framework/yii/gii/generators/crud/Generator.php

@@ -7,6 +7,7 @@
 
 namespace yii\gii\generators\crud;
 
+use yii\base\Model;
 use yii\db\ActiveRecord;
 use yii\gii\CodeFile;
 use yii\web\Controller;
@@ -21,6 +22,9 @@ class Generator extends \yii\gii\Generator
 	public $modelClass;
 	public $controllerID;
 	public $baseControllerClass = 'yii\web\Controller';
+	public $indexWidgetType = 'grid';
+	public $enableSearch = true;
+	public $searchModelClass;
 
 	public function getName()
 	{
@@ -36,9 +40,9 @@ class Generator extends \yii\gii\Generator
 	public function rules()
 	{
 		return array_merge(parent::rules(), array(
-			array('modelClass, controllerID, baseControllerClass', 'filter', 'filter' => 'trim'),
-			array('modelClass, controllerID, baseControllerClass', 'required'),
-			array('modelClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'),
+			array('modelClass, searchModelClass, controllerID, baseControllerClass', 'filter', 'filter' => 'trim'),
+			array('modelClass, searchModelClass, controllerID, baseControllerClass', 'required'),
+			array('modelClass, searchModelClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'),
 			array('modelClass', 'validateClass', 'params' => array('extends' => ActiveRecord::className())),
 			array('controllerID', 'match', 'pattern' => '/^[a-z\\-\\/]*$/', 'message' => 'Only a-z, dashes (-) and slashes (/) are allowed.'),
 			array('baseControllerClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'),
@@ -52,6 +56,9 @@ class Generator extends \yii\gii\Generator
 			'modelClass' => 'Model Class',
 			'controllerID' => 'Controller ID',
 			'baseControllerClass' => 'Base Controller Class',
+			'indexWidgetType' => 'Widget Used in Index Page',
+			'enableSearch' => 'Enable Search',
+			'searchModelClass' => 'Search Model Class',
 		));
 	}
 
@@ -72,6 +79,13 @@ class Generator extends \yii\gii\Generator
 				</ul>',
 			'baseControllerClass' => 'This is the class that the new CRUD controller class will extend from.
 				You should provide a fully qualified class name, e.g., <code>yii\web\Controller</code>.',
+			'indexWidgetType' => 'This is the widget type to be used in the index page to display list of the models.
+				You may choose either <code>GridView</code> or <code>ListView</code>',
+			'enableSearch' => 'Whether to enable the search functionality on the index page. When search is enabled,
+				a search form will be displayed on the index page, and the index page will display the search results.',
+			'searchModelClass' => 'This is the class representing the data being collecting in the search form.
+			 	A fully qualified namespaced class name is required, e.g., <code>app\models\PostSearchForm</code>.
+				This is only used when search is enabled.',
 		);
 	}
 
@@ -87,7 +101,7 @@ class Generator extends \yii\gii\Generator
 	 */
 	public function stickyAttributes()
 	{
-		return array('baseControllerClass');
+		return array('baseControllerClass', 'indexWidgetType', 'enableSearch');
 	}
 
 	/**

framework/yii/gii/generators/crud/form.php

@@ -8,3 +8,9 @@
 echo $form->field($generator, 'modelClass');
 echo $form->field($generator, 'controllerID');
 echo $form->field($generator, 'baseControllerClass');
+echo $form->field($generator, 'indexWidgetType')->dropDownList(array(
+	'grid' => 'GridView',
+	'list' => 'ListView',
+));
+echo $form->field($generator, 'enableSearch')->checkbox();
+echo $form->field($generator, 'searchModelClass');

framework/yii/gii/generators/crud/templates/controller.php

 <?php
 /**
- * Created by JetBrains PhpStorm.
- * User: qiang
- * Date: 8/26/13
- * Time: 5:22 PM
- * To change this template use File | Settings | File Templates.
+ * This is the template for generating a controller class file for CRUD feature.
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
  */
+?>
+<?php echo "<?php\n"; ?>
+
+class <?php echo $this->controllerClass; ?> extends <?php echo $this->baseControllerClass."\n"; ?>
+{
+	/**
+	 * @var string the default layout for the views. Defaults to '//layouts/column2', meaning
+	 * using two-column layout. See 'protected/views/layouts/column2.php'.
+	 */
+	public $layout='//layouts/column2';
+
+	/**
+	 * @return array action filters
+	 */
+	public function filters()
+	{
+		return array(
+			'accessControl', // perform access control for CRUD operations
+			'postOnly + delete', // we only allow deletion via POST request
+		);
+	}
+
+	/**
+	 * Specifies the access control rules.
+	 * This method is used by the 'accessControl' filter.
+	 * @return array access control rules
+	 */
+	public function accessRules()
+	{
+		return array(
+			array('allow',  // allow all users to perform 'index' and 'view' actions
+				'actions'=>array('index','view'),
+				'users'=>array('*'),
+			),
+			array('allow', // allow authenticated user to perform 'create' and 'update' actions
+				'actions'=>array('create','update'),
+				'users'=>array('@'),
+			),
+			array('allow', // allow admin user to perform 'admin' and 'delete' actions
+				'actions'=>array('admin','delete'),
+				'users'=>array('admin'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+
+	/**
+	 * Displays a particular model.
+	 * @param integer $id the ID of the model to be displayed
+	 */
+	public function actionView($id)
+	{
+		$this->render('view',array(
+			'model'=>$this->loadModel($id),
+		));
+	}
+
+	/**
+	 * Creates a new model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 */
+	public function actionCreate()
+	{
+		$model=new <?php echo $this->modelClass; ?>;
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['<?php echo $this->modelClass; ?>']))
+		{
+			$model->attributes=$_POST['<?php echo $this->modelClass; ?>'];
+			if($model->save())
+				$this->redirect(array('view','id'=>$model-><?php echo $this->tableSchema->primaryKey; ?>));
+		}
+
+		$this->render('create',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Updates a particular model.
+	 * If update is successful, the browser will be redirected to the 'view' page.
+	 * @param integer $id the ID of the model to be updated
+	 */
+	public function actionUpdate($id)
+	{
+		$model=$this->loadModel($id);
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['<?php echo $this->modelClass; ?>']))
+		{
+			$model->attributes=$_POST['<?php echo $this->modelClass; ?>'];
+			if($model->save())
+				$this->redirect(array('view','id'=>$model-><?php echo $this->tableSchema->primaryKey; ?>));
+		}
+
+		$this->render('update',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Deletes a particular model.
+	 * If deletion is successful, the browser will be redirected to the 'admin' page.
+	 * @param integer $id the ID of the model to be deleted
+	 */
+	public function actionDelete($id)
+	{
+		$this->loadModel($id)->delete();
+
+		// if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser
+		if(!isset($_GET['ajax']))
+			$this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin'));
+	}
+
+	/**
+	 * Lists all models.
+	 */
+	public function actionIndex()
+	{
+		$dataProvider=new CActiveDataProvider('<?php echo $this->modelClass; ?>');
+		$this->render('index',array(
+			'dataProvider'=>$dataProvider,
+		));
+	}
+
+	/**
+	 * Manages all models.
+	 */
+	public function actionAdmin()
+	{
+		$model=new <?php echo $this->modelClass; ?>('search');
+		$model->unsetAttributes();  // clear any default values
+		if(isset($_GET['<?php echo $this->modelClass; ?>']))
+			$model->attributes=$_GET['<?php echo $this->modelClass; ?>'];
+
+		$this->render('admin',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Returns the data model based on the primary key given in the GET variable.
+	 * If the data model is not found, an HTTP exception will be raised.
+	 * @param integer $id the ID of the model to be loaded
+	 * @return <?php echo $this->modelClass; ?> the loaded model
+	 * @throws CHttpException
+	 */
+	public function loadModel($id)
+	{
+		$model=<?php echo $this->modelClass; ?>::model()->findByPk($id);
+		if($model===null)
+			throw new CHttpException(404,'The requested page does not exist.');
+		return $model;
+	}
+
+	/**
+	 * Performs the AJAX validation.
+	 * @param <?php echo $this->modelClass; ?> $model the model to be validated
+	 */
+	protected function performAjaxValidation($model)
+	{
+		if(isset($_POST['ajax']) && $_POST['ajax']==='<?php echo $this->class2id($this->modelClass); ?>-form')
+		{
+			echo CActiveForm::validate($model);
+			Yii::app()->end();
+		}
+	}
+}

framework/yii/gii/generators/crud/templates/views/_form.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+/* @var $form CActiveForm */
+?>
+
+<div class="form">
+
+<?php echo "<?php \$form=\$this->beginWidget('CActiveForm', array(
+	'id'=>'".$this->class2id($this->modelClass)."-form',
+	// Please note: When you enable ajax validation, make sure the corresponding
+	// controller action is handling ajax validation correctly.
+	// There is a call to performAjaxValidation() commented in generated controller code.
+	// See class documentation of CActiveForm for details on this.
+	'enableAjaxValidation'=>false,
+)); ?>\n"; ?>
+
+	<p class="note">Fields with <span class="required">*</span> are required.</p>
+
+	<?php echo "<?php echo \$form->errorSummary(\$model); ?>\n"; ?>
+
+<?php
+foreach($this->tableSchema->columns as $column)
+{
+	if($column->autoIncrement)
+		continue;
+?>
+	<div class="row">
+		<?php echo "<?php echo ".$this->generateActiveLabel($this->modelClass,$column)."; ?>\n"; ?>
+		<?php echo "<?php echo ".$this->generateActiveField($this->modelClass,$column)."; ?>\n"; ?>
+		<?php echo "<?php echo \$form->error(\$model,'{$column->name}'); ?>\n"; ?>
+	</div>
+
+<?php
+}
+?>
+	<div class="row buttons">
+		<?php echo "<?php echo CHtml::submitButton(\$model->isNewRecord ? 'Create' : 'Save'); ?>\n"; ?>
+	</div>
+
+<?php echo "<?php \$this->endWidget(); ?>\n"; ?>
+
+</div><!-- form -->
\ No newline at end of file

framework/yii/gii/generators/crud/templates/views/_search.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+/* @var $form CActiveForm */
+?>
+
+<div class="wide form">
+
+<?php echo "<?php \$form=\$this->beginWidget('CActiveForm', array(
+	'action'=>Yii::app()->createUrl(\$this->route),
+	'method'=>'get',
+)); ?>\n"; ?>
+
+<?php foreach($this->tableSchema->columns as $column): ?>
+<?php
+	$field=$this->generateInputField($this->modelClass,$column);
+	if(strpos($field,'password')!==false)
+		continue;
+?>
+	<div class="row">
+		<?php echo "<?php echo \$form->label(\$model,'{$column->name}'); ?>\n"; ?>
+		<?php echo "<?php echo ".$this->generateActiveField($this->modelClass,$column)."; ?>\n"; ?>
+	</div>
+
+<?php endforeach; ?>
+	<div class="row buttons">
+		<?php echo "<?php echo CHtml::submitButton('Search'); ?>\n"; ?>
+	</div>
+
+<?php echo "<?php \$this->endWidget(); ?>\n"; ?>
+
+</div><!-- search-form -->
\ No newline at end of file

framework/yii/gii/generators/crud/templates/views/_view.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $data <?php echo $this->getModelClass(); ?> */
+?>
+
+<div class="view">
+
+<?php
+echo "\t<b><?php echo CHtml::encode(\$data->getAttributeLabel('{$this->tableSchema->primaryKey}')); ?>:</b>\n";
+echo "\t<?php echo CHtml::link(CHtml::encode(\$data->{$this->tableSchema->primaryKey}), array('view', 'id'=>\$data->{$this->tableSchema->primaryKey})); ?>\n\t<br />\n\n";
+$count=0;
+foreach($this->tableSchema->columns as $column)
+{
+	if($column->isPrimaryKey)
+		continue;
+	if(++$count==7)
+		echo "\t<?php /*\n";
+	echo "\t<b><?php echo CHtml::encode(\$data->getAttributeLabel('{$column->name}')); ?>:</b>\n";
+	echo "\t<?php echo CHtml::encode(\$data->{$column->name}); ?>\n\t<br />\n\n";
+}
+if($count>=7)
+	echo "\t*/ ?>\n";
+?>
+
+</div>
\ No newline at end of file

framework/yii/gii/generators/crud/templates/views/create.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+
+<?php
+$label=$this->pluralize($this->class2name($this->modelClass));
+echo "\$this->breadcrumbs=array(
+	'$label'=>array('index'),
+	'Create',
+);\n";
+?>
+
+$this->menu=array(
+	array('label'=>'List <?php echo $this->modelClass; ?>', 'url'=>array('index')),
+	array('label'=>'Manage <?php echo $this->modelClass; ?>', 'url'=>array('admin')),
+);
+?>
+
+<h1>Create <?php echo $this->modelClass; ?></h1>
+
+<?php echo "<?php \$this->renderPartial('_form', array('model'=>\$model)); ?>"; ?>

framework/yii/gii/generators/crud/templates/views/index-grid.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+
+<?php
+$label=$this->pluralize($this->class2name($this->modelClass));
+echo "\$this->breadcrumbs=array(
+	'$label'=>array('index'),
+	'Manage',
+);\n";
+?>
+
+$this->menu=array(
+	array('label'=>'List <?php echo $this->modelClass; ?>', 'url'=>array('index')),
+	array('label'=>'Create <?php echo $this->modelClass; ?>', 'url'=>array('create')),
+);
+
+Yii::app()->clientScript->registerScript('search', "
+$('.search-button').click(function(){
+	$('.search-form').toggle();
+	return false;
+});
+$('.search-form form').submit(function(){
+	$('#<?php echo $this->class2id($this->modelClass); ?>-grid').yiiGridView('update', {
+		data: $(this).serialize()
+	});
+	return false;
+});
+");
+?>
+
+<h1>Manage <?php echo $this->pluralize($this->class2name($this->modelClass)); ?></h1>
+
+<p>
+You may optionally enter a comparison operator (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b>
+or <b>=</b>) at the beginning of each of your search values to specify how the comparison should be done.
+</p>
+
+<?php echo "<?php echo CHtml::link('Advanced Search','#',array('class'=>'search-button')); ?>"; ?>
+
+<div class="search-form" style="display:none">
+<?php echo "<?php \$this->renderPartial('_search',array(
+	'model'=>\$model,
+)); ?>\n"; ?>
+</div><!-- search-form -->
+
+<?php echo "<?php"; ?> $this->widget('zii.widgets.grid.CGridView', array(
+	'id'=>'<?php echo $this->class2id($this->modelClass); ?>-grid',
+	'dataProvider'=>$model->search(),
+	'filter'=>$model,
+	'columns'=>array(
+<?php
+$count=0;
+foreach($this->tableSchema->columns as $column)
+{
+	if(++$count==7)
+		echo "\t\t/*\n";
+	echo "\t\t'".$column->name."',\n";
+}
+if($count>=7)
+	echo "\t\t*/\n";
+?>
+		array(
+			'class'=>'CButtonColumn',
+		),
+	),
+)); ?>

framework/yii/gii/generators/crud/templates/views/index.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $dataProvider CActiveDataProvider */
+
+<?php
+$label=$this->pluralize($this->class2name($this->modelClass));
+echo "\$this->breadcrumbs=array(
+	'$label',
+);\n";
+?>
+
+$this->menu=array(
+	array('label'=>'Create <?php echo $this->modelClass; ?>', 'url'=>array('create')),
+	array('label'=>'Manage <?php echo $this->modelClass; ?>', 'url'=>array('admin')),
+);
+?>
+
+<h1><?php echo $label; ?></h1>
+
+<?php echo "<?php"; ?> $this->widget('zii.widgets.CListView', array(
+	'dataProvider'=>$dataProvider,
+	'itemView'=>'_view',
+)); ?>

framework/yii/gii/generators/crud/templates/views/update.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+
+<?php
+$nameColumn=$this->guessNameColumn($this->tableSchema->columns);
+$label=$this->pluralize($this->class2name($this->modelClass));
+echo "\$this->breadcrumbs=array(
+	'$label'=>array('index'),
+	\$model->{$nameColumn}=>array('view','id'=>\$model->{$this->tableSchema->primaryKey}),
+	'Update',
+);\n";
+?>
+
+$this->menu=array(
+	array('label'=>'List <?php echo $this->modelClass; ?>', 'url'=>array('index')),
+	array('label'=>'Create <?php echo $this->modelClass; ?>', 'url'=>array('create')),
+	array('label'=>'View <?php echo $this->modelClass; ?>', 'url'=>array('view', 'id'=>$model-><?php echo $this->tableSchema->primaryKey; ?>)),
+	array('label'=>'Manage <?php echo $this->modelClass; ?>', 'url'=>array('admin')),
+);
+?>
+
+<h1>Update <?php echo $this->modelClass." <?php echo \$model->{$this->tableSchema->primaryKey}; ?>"; ?></h1>
+
+<?php echo "<?php \$this->renderPartial('_form', array('model'=>\$model)); ?>"; ?>
\ No newline at end of file

framework/yii/gii/generators/crud/templates/views/view.php

+<?php
+/**
+ * The following variables are available in this template:
+ * - $this: the CrudCode object
+ */
+?>
+<?php echo "<?php\n"; ?>
+/* @var $this <?php echo $this->getControllerClass(); ?> */
+/* @var $model <?php echo $this->getModelClass(); ?> */
+
+<?php
+$nameColumn=$this->guessNameColumn($this->tableSchema->columns);
+$label=$this->pluralize($this->class2name($this->modelClass));
+echo "\$this->breadcrumbs=array(
+	'$label'=>array('index'),
+	\$model->{$nameColumn},
+);\n";
+?>
+
+$this->menu=array(
+	array('label'=>'List <?php echo $this->modelClass; ?>', 'url'=>array('index')),
+	array('label'=>'Create <?php echo $this->modelClass; ?>', 'url'=>array('create')),
+	array('label'=>'Update <?php echo $this->modelClass; ?>', 'url'=>array('update', 'id'=>$model-><?php echo $this->tableSchema->primaryKey; ?>)),
+	array('label'=>'Delete <?php echo $this->modelClass; ?>', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model-><?php echo $this->tableSchema->primaryKey; ?>),'confirm'=>'Are you sure you want to delete this item?')),
+	array('label'=>'Manage <?php echo $this->modelClass; ?>', 'url'=>array('admin')),
+);
+?>
+
+<h1>View <?php echo $this->modelClass." #<?php echo \$model->{$this->tableSchema->primaryKey}; ?>"; ?></h1>
+
+<?php echo "<?php"; ?> $this->widget('zii.widgets.CDetailView', array(
+	'data'=>$model,
+	'attributes'=>array(
+<?php
+foreach($this->tableSchema->columns as $column)
+	echo "\t\t'".$column->name."',\n";
+?>
+	),
+)); ?>

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

@@ -30,6 +30,7 @@ foreach ($generator->templates as $name => $path) {
 
 	<?php $form = ActiveForm::begin(array(
 		'id' => "$id-generator",
+		'successCssClass' => '',
 		'fieldConfig' => array('class' => ActiveField::className()),
 	)); ?>
 		<div class="row">