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

fixes #1001

Browse Source
This commit is contained in:
Alexander Makarov
2013-10-24 02:00:43 +04:00
parent 752037d95b
commit ffb37f8eab
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/grid/DataColumn.php
View File

@@ -41,10 +41,10 @@ class DataColumn extends Column
*/ */
public $value; public $value;
/** /**
* @var string in which format should the value of each data model be displayed as (e.g. "text", "html"). * @var string|array in which format should the value of each data model be displayed as (e.g. "text", "html",
* Supported formats are determined by the [[GridView::formatter|formatter]] used by the [[GridView]]. * ['date', 'Y-m-d']). Supported formats are determined by the [[GridView::formatter|formatter]] used by
* Default format is "text" which will format the value as an HTML-encoded plain text when * the [[GridView]]. Default format is "text" which will format the value as an HTML-encoded plain text when
* [[\yii\base\Formatter]] or [[\yii\i18n\Formatter]] is used. * [[\yii\base\Formatter::format()]] or [[\yii\i18n\Formatter::format()]] is used.
*/ */
public $format = 'text'; public $format = 'text';
/** /**

2
framework/yii/validators/UniqueValidator.php
View File

@@ -12,7 +12,7 @@ use yii\base\InvalidConfigException;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
/** /**
* CUniqueValidator validates that the attribute value is unique in the corresponding database table. * UniqueValidator validates that the attribute value is unique in the corresponding database table.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0