fixed a couple of bugs in custom elements

This commit is contained in:
jamiesensei 2006-11-21 10:14:38 +00:00
parent 6e372b2591
commit 0e6303103b
2 changed files with 26 additions and 18 deletions

View file

@ -154,11 +154,15 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group{
function exportValue(&$submitValues, $assoc = false) function exportValue(&$submitValues, $assoc = false)
{ {
$value = null; $value = null;
$valuearray = $this->_elements[0]->exportValue($submitValues[$this->getName()], true); print_object($submitValues);
$valuearray +=$this->_elements[1]->exportValue($submitValues[$this->getName()], true); $valuearray = array();
$valuearray +=$this->_elements[2]->exportValue($submitValues[$this->getName()], true); foreach ($this->_elements as $element){
$valuearray +=$this->_elements[3]->exportValue($submitValues[$this->getName()], true); $thisexport = $element->exportValue($submitValues[$this->getName()], true);
$valuearray +=$this->_elements[4]->exportValue($submitValues[$this->getName()], true); if ($thisexport!=null){
$valuearray += $thisexport;
}
}
if (count($valuearray)){
$value[$this->getName()]=make_timestamp($valuearray['year'], $value[$this->getName()]=make_timestamp($valuearray['year'],
$valuearray['month'], $valuearray['month'],
$valuearray['day'], $valuearray['day'],
@ -167,7 +171,11 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group{
0, 0,
$this->_options['timezone'], $this->_options['timezone'],
$this->_options['applydst']); $this->_options['applydst']);
return $value; return $value;
} else {
return null;
}
} }
// }}} // }}}

View file

@ -25,7 +25,7 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit
function MoodleQuickForm_submit($elementName=null, $value=null, $attributes=null) function MoodleQuickForm_submit($elementName=null, $value=null, $attributes=null)
{ {
HTML_QuickForm_submit::HTML_QuickForm_submit($elementName, $value, $attributes); HTML_QuickForm_submit::HTML_QuickForm_submit($elementName, $value, $attributes);
if ($elementName='cancel'){ if ('cancel'==$elementName){
//bypass form validation js : //bypass form validation js :
$this->updateAttributes(array('onclick'=>'this.form.submit();')); $this->updateAttributes(array('onclick'=>'this.form.submit();'));
} }