Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

(Fixes issue 1799) Better fix as the old one (r2674) was breaking CJu…

…idatePicker tabular input
  • Loading branch information...
commit 99bdf5efbd0e5b4496b853618d7125dc33610ee9 1 parent 76b8765
mdomba authored
Showing with 3 additions and 4 deletions.
  1. +1 −0  CHANGELOG
  2. +2 −4 framework/zii/widgets/jui/CJuiDatePicker.php
View
1  CHANGELOG
@@ -5,6 +5,7 @@
Version 1.1.10 work in progress
-------------------------------
- Bug Fixed the bug introduced in 1.1.9 CActiveForm required field was not validated if left empty (mdomba)
+- Bug #1799: Better fix for bug #1799 old fix was breaking CJuiDatePicker tabular input (mdomba)
- Bug #3070: Fixed the CACtiveForm JS error if there is no field rendered (mdomba)
- Bug #3071: Fixed the bug that afterValidateAttribute was not called properly (mdomba)
- Bug #3096: Fixed the bug when reporting an error and CHtml is not loaded (mdomba)
View
6 framework/zii/widgets/jui/CJuiDatePicker.php
@@ -80,8 +80,6 @@ public function run()
$this->htmlOptions['id']=$id;
if(isset($this->htmlOptions['name']))
$name=$this->htmlOptions['name'];
- else
- $this->htmlOptions['name']=$name;
if ($this->flat===false)
{
@@ -107,8 +105,8 @@ public function run()
if (!isset($this->options['onSelect']))
$this->options['onSelect']="js:function( selectedDate ) { jQuery('#{$id}').val(selectedDate);}";
- $id = $this->htmlOptions['id'] = $this->htmlOptions['id'].'_container';
- $this->htmlOptions['name'] = $this->htmlOptions['name'].'_container';
+ $id = $this->htmlOptions['id'] = $id.'_container';
+ $this->htmlOptions['name'] = $name.'_container';
echo CHtml::tag('div', $this->htmlOptions, '');
}
Please sign in to comment.
Something went wrong with that request. Please try again.