L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added defaults for when there is no submitted data to datetimeselector and small fix for forum\mod_form.php

Browse Source
This commit is contained in:
jamiesensei
2006-11-23 09:38:33 +00:00
parent f4bf6a5b15
commit 02f8f37d5d
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/datetimeselector.php
+15 -13
View File
@@ -157,24 +157,26 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group{
$valuearray = array();
foreach ($this->_elements as $element){
$thisexport = $element->exportValue($submitValues[$this->getName()], true);
if ($thisexport!=null){
if ($thisexport!==null){
$valuearray += $thisexport;
}
}
if (count($valuearray)){
$value[$this->getName()]=make_timestamp($valuearray['year'],
$valuearray['month'],
$valuearray['day'],
$valuearray['hour'],
$valuearray['minute'],
0,
$this->_options['timezone'],
$this->_options['applydst']);
return $value;
} else {
if (count($valuearray)==0){
return null;
}
$valuearray=$valuearray + array('year'=>1970, 'month'=>1, 'day'=>1, 'hour'=>0, 'minute'=>0);
$value[$this->getName()]=make_timestamp(
$valuearray['year'],
$valuearray['month'],
$valuearray['day'],
$valuearray['hour'],
$valuearray['minute'],
0,
$this->_options['timezone'],
$this->_options['applydst']);
return $value;
}
// }}}
mod/forum/mod_form.php
+11 -7
View File
@@ -148,14 +148,18 @@ class forum_mod_form extends moodleform_mod {
$type->freeze();
$type->setPersistantFreeze(true);
}
$assesstimestartvalue=is_array($mform->getElementValue('assesstimestart'));
$assesstimefinishvalue=is_array($mform->getElementValue('assesstimefinish'));
$ratingtime=&$mform->getElement('ratingtime');
if ($assesstimestartvalue && $assesstimefinishvalue){
$ratingtime->setValue(true);
} else {
$ratingtime->setValue(false);
}
function set_defaults($default_values, $slashed=false){
if (is_object($default_values)) {
$default_values = (array)$default_values;
}
if (isset($default_values['assessed'])){
$default_values['ratingtime']=($default_values['assessed']
&& $default_values['assesstimestart']
&& $default_values['assesstimefinish'] )?1:0;
}
parent::set_defaults($default_values, $slashed);
}