Skip to content

Commit

Permalink
Enhancements to the #1980.
Browse files Browse the repository at this point in the history
  • Loading branch information
resurtm committed Mar 20, 2013
1 parent c2722a4 commit de416ba
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
23 changes: 12 additions & 11 deletions framework/web/helpers/CHtml.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1238,18 +1238,18 @@ public static function activeLabelEx($model,$attribute,$htmlOptions=array())
return self::activeLabel($model,$realAttribute,$htmlOptions); return self::activeLabel($model,$realAttribute,$htmlOptions);
} }


/** /**
* Generates a text field input for a model attribute. * Generates a text field input for a model attribute.
* If the attribute has input error, the input field's CSS class will * If the attribute has input error, the input field's CSS class will
* be appended with {@link errorCss}. * be appended with {@link errorCss}.
* @param CModel $model the data model * @param CModel $model the data model
* @param string $attribute the attribute * @param string $attribute the attribute
* @param array $htmlOptions additional HTML attributes. Besides normal HTML attributes, a few special * @param array $htmlOptions additional HTML attributes. Besides normal HTML attributes, a few special
* attributes are also recognized (see {@link clientChange} and {@link tag} for more details.) * attributes are also recognized (see {@link clientChange} and {@link tag} for more details.)
* @return string the generated input field * @return string the generated input field
* @see clientChange * @see clientChange
* @see activeInputField * @see activeInputField
*/ */
public static function activeTextField($model,$attribute,$htmlOptions=array()) public static function activeTextField($model,$attribute,$htmlOptions=array())
{ {
self::resolveNameID($model,$attribute,$htmlOptions); self::resolveNameID($model,$attribute,$htmlOptions);
Expand All @@ -1268,6 +1268,7 @@ public static function activeTextField($model,$attribute,$htmlOptions=array())
* @return string the generated input field * @return string the generated input field
* @see clientChange * @see clientChange
* @see activeInputField * @see activeInputField
* @since 1.1.14
*/ */
public static function activeSearchField($model,$attribute,$htmlOptions=array()) public static function activeSearchField($model,$attribute,$htmlOptions=array())
{ {
Expand Down
3 changes: 2 additions & 1 deletion framework/web/widgets/CActiveForm.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -669,12 +669,13 @@ public function textField($model,$attribute,$htmlOptions=array())
* @param string $attribute the attribute * @param string $attribute the attribute
* @param array $htmlOptions additional HTML attributes. * @param array $htmlOptions additional HTML attributes.
* @return string the generated input field * @return string the generated input field
* @since 1.1.14
*/ */
public function searchField($model,$attribute,$htmlOptions=array()) public function searchField($model,$attribute,$htmlOptions=array())
{ {
return CHtml::activeSearchField($model,$attribute,$htmlOptions); return CHtml::activeSearchField($model,$attribute,$htmlOptions);
} }

/** /**
* Renders a hidden field for a model attribute. * Renders a hidden field for a model attribute.
* This method is a wrapper of {@link CHtml::activeHiddenField}. * This method is a wrapper of {@link CHtml::activeHiddenField}.
Expand Down

0 comments on commit de416ba

Please sign in to comment.