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

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source 
* 'master' of github.com:yiisoft/yii2:
  Fixes #968: clientOptions should not be ignored when enabling internationalization.
  minor doc fix.
This commit is contained in:
Carsten Brandt
2013-10-13 15:20:16 +02:00
parent 3a981e26da bc743a32b7
commit a1e6c16e39
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/active-record.md
View File

@@ -175,7 +175,9 @@ $customer->delete();
Customer::updateAllCounters(array('age' => 1)); Customer::updateAllCounters(array('age' => 1));
``` ```
Notice that you can always use the `save` method, and ActiveRecord will automatically perform an INSERT for new records and an UPDATE for existing ones. > Info: The `save()` method will either perform an `INSERT` or `UPDATE` SQL statement, depending
on whether the ActiveRecord being saved is new or not by checking `ActiveRecord::isNewRecord`.
Data Input and Validation Data Input and Validation
------------------------- -------------------------

4
docs/guide/validation.md
View File

@@ -38,7 +38,7 @@ Compares the specified attribute value with another value and validates if they
Verifies if the attribute represents a date, time or datetime in a proper format. Verifies if the attribute represents a date, time or datetime in a proper format.
- `format` the date format that the value being validated should follow accodring to [[http://www.php.net/manual/en/datetime.createfromformat.php]]. _('Y-m-d')_ - `format` the date format that the value being validated should follow according to [[http://www.php.net/manual/en/datetime.createfromformat.php]]. _('Y-m-d')_
- `timestampAttribute` the name of the attribute to receive the parsing result. - `timestampAttribute` the name of the attribute to receive the parsing result.
### `default`: [[DefaultValueValidator]] ### `default`: [[DefaultValueValidator]]
@@ -179,4 +179,4 @@ if ($validator->validateValue($email)) {
} }
``` ```
TBD: refer to http://www.yiiframework.com/wiki/56/ for the format TBD: refer to http://www.yiiframework.com/wiki/56/ for the format

13
extensions/jui/yii/jui/DatePicker.php
View File

@@ -9,6 +9,7 @@ namespace yii\jui;
use Yii; use Yii;
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Json;
/** /**
* DatePicker renders an datepicker jQuery UI widget. * DatePicker renders an datepicker jQuery UI widget.
@@ -61,11 +62,19 @@ class DatePicker extends InputWidget
public function run() public function run()
{ {
echo $this->renderWidget() . "\n"; echo $this->renderWidget() . "\n";
$this->registerWidget('datepicker', DatePickerAsset::className());
if ($this->language !== false) { if ($this->language !== false) {
$view = $this->getView(); $view = $this->getView();
DatePickerRegionalAsset::register($view); DatePickerRegionalAsset::register($view);
$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.datepicker.regional['{$this->language}']);"); // do not pass in any options when creating the widget
// set the options later so that the options can be combined with regional options
$options = $this->clientOptions;
$this->clientOptions = array();
$this->registerWidget('datepicker', DatePickerAsset::className());
$this->clientOptions = $options;
$options = Json::encode($options);
$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.extend({}, $.datepicker.regional['{$this->language}'], $options));");
} else {
$this->registerWidget('datepicker', DatePickerAsset::className());
} }
} }