oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Form Date and DateTime to properly handle mysql and epoch times. Added tests to make sure they work.

Browse source
This commit is contained in:
Kaleb Murphy 2008-08-04 20:23:13 +00:00
parent a81999d5ea
commit e7f5948ce1
7 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Form/DateTime.pm
View file

@ -138,20 +138,29 @@ sub getValue {
my $self = shift;
# This should probably be rewritten as a cascading ternary
my $value = $self->SUPER::getValue(@_);
if (!$self->get("defaultValue") || $self->get("defaultValue") =~ m/^\d+$/ || !$self->get("value") || $self->get("value") =~ m/^\d+$/) {
if (!$self->getDefaultValue || $self->getDefaultValue =~ m/^\d+$/) {
# Epoch format
if($value =~ /^\d+$/){
return $value;
}
return $self->session->datetime->setToEpoch($value);
}
else {
# MySQL format
# YY(YY)?-MM-DD HH:MM:SS
if($value =~ /^\d+$/){
return $self->session->datetime->epochToSet($value,$self->session->user->profileField( 'timeZone' ));
}
# Verify format
return undef
unless ($value =~ m/(?:\d{2}|\d{4})\D\d{2}\D\d{2}\D\d{2}\D\d{2}\D\d{2}/);
# Fix time zone
$value = WebGUI::DateTime->new(mysql => $value, time_zone => $self->get("timeZone"))
$value = WebGUI::DateTime->new($self->session,mysql => $value, time_zone=>$self->session->user->profileField( 'timeZone' ))
->set_time_zone("UTC")->toMysql;
return $value;