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

Fix multiple Date and DateTime bugs. bug #11079 and bug #11071

Browse source
This commit is contained in:
Colin Kuskie 2009-09-30 16:50:08 -07:00
parent ddc33b76bb
commit 25b4a0b139
6 changed files with 202 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/DateTime.pm
View file

@ -153,7 +153,7 @@ sub new
{
$self = $class->SUPER::new(@_);
}
elsif ($_[0] =~ /^\d+$/)
elsif ($_[0] =~ /^-?\d+$/)
{
$self = DateTime->from_epoch(epoch=>$_[0], time_zone=>"UTC", locale=>$locale);
}

63
lib/WebGUI/Form/Date.pm
View file

@ -19,6 +19,8 @@ use base 'WebGUI::Form::Text';
use WebGUI::Form::Hidden;
use WebGUI::International;
my $isaEpoch = qr/^-?\d+$/;
=head1 NAME
Package WebGUI::Form::Date
@ -137,9 +139,9 @@ sub getValue {
my $self = shift;
# This should probably be rewritten as a cascading ternary
my $value = $self->SUPER::getValue(@_);
if (!$self->getDefaultValue || $self->getDefaultValue =~ m/^\d+$/) {
if (!$self->getDefaultValue || $self->getDefaultValue =~ $isaEpoch) {
# Epoch format
if($value =~ /^\d+$/){
if($value =~ $isaEpoch){
return $value;
}
return $self->session->datetime->setToEpoch($value);
@ -150,10 +152,7 @@ sub getValue {
# NOTE: Cannot fix time zone since we don't have a complete date/time
# MySQL format
# YY(YY)?-MM-DD HH:MM:SS
if($value =~ /^\d+$/){
if($value =~ $isaEpoch){
return $self->session->datetime->epochToSet($value,$self->session->user->profileField( 'timeZone' ));
}
@ -173,17 +172,17 @@ Return the date in a human readable format.
=cut
sub getValueAsHtml {
my ($self) = @_;
my ($self) = @_;
# This should probably be rewritten as a cascading ternary
if (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
return $self->session->datetime->epochToHuman($self->getOriginalValue,"%z");
}
if ( !$self->get("defaultValue")
|| $self->get("defaultValue") =~ $isaEpoch
|| !$self->get("value")
|| $self->get("value") =~ $isaEpoch) {
return $self->session->datetime->epochToSet($self->getOriginalValue);
}
else {
# MySQL format
my $value = $self->getOriginalValue;
# MySQL format
my $value = $self->getOriginalValue;
return $value;
}
}
@ -217,17 +216,8 @@ sub toHtml {
# No default date
$value = $self->set("value",'');
}
elsif (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
# Epoch format
$value = $session->datetime->epochToSet($self->getOriginalValue);
}
else {
# MySQL format
$value = $self->getOriginalValue;
# NOTE: Cannot fix time zone since we don't have a complete date/time
$value = $self->getValueAsHtml;
}
my $style = $session->style;
@ -263,24 +253,11 @@ Renders the form field to HTML as a hidden field rather than whatever field type
sub toHtmlAsHidden {
my $self = shift;
my $value;
# This should probably be rewritten as a cascading ternary
if (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
$value = $self->session->datetime->epochToSet($self->getOriginalValue,"%z");
} else {
# MySQL format
$value = $self->getOriginalValue;
# NOTE: Cannot fix time zone since we don't have a complete date/time
}
return WebGUI::Form::Hidden->new($self->session,
name => $self->get("name"),
value => $value,
)->toHtmlAsHidden;
my $value = $self->getValueAsHtml();
return WebGUI::Form::Hidden->new($self->session,
name => $self->get("name"),
value => $value,
)->toHtmlAsHidden;
}
1;

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

@ -20,6 +20,8 @@ use WebGUI::Form::Hidden;
use WebGUI::International;
use WebGUI::DateTime;
my $isaEpoch = qr/^-?\d+$/;
=head1 NAME
Package WebGUI::Form::DateTime
@ -139,9 +141,9 @@ sub getValue {
# This should probably be rewritten as a cascading ternary
my $value = $self->SUPER::getValue(@_);
if (!$self->getDefaultValue || $self->getDefaultValue =~ m/^\d+$/) {
if (!$self->getDefaultValue || $self->getDefaultValue =~ $isaEpoch) {
# Epoch format
if($value =~ /^\d+$/){
if($value =~ $isaEpoch){
return $value;
}
return $self->session->datetime->setToEpoch($value);
@ -150,7 +152,7 @@ sub getValue {
# MySQL format
# YY(YY)?-MM-DD HH:MM:SS
if($value =~ /^\d+$/){
if($value =~ $isaEpoch){
return $self->session->datetime->epochToSet($value,$self->session->user->profileField( 'timeZone' ));
}
@ -178,8 +180,10 @@ Return the date in a human readable format.
sub getValueAsHtml {
my ($self) = @_;
# This should probably be rewritten as a cascading ternary
my $formatValue = $self->getDefaultValue || $self->getOriginalValue;
if (!$formatValue || $formatValue =~ m/^\d+$/) {
if ( !$self->get("defaultValue")
|| $self->get("defaultValue") =~ $isaEpoch
|| !$self->get("value")
|| $self->get("value") =~ $isaEpoch) {
return $self->session->datetime->epochToHuman($self->getOriginalValue,"%z %Z");
}
else {
@ -216,22 +220,10 @@ Renders a date picker control.
sub toHtml {
my $self = shift;
my $session = $self->session;
my $value;
# This should probably be rewritten as a cascading ternary
if (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
# Epoch format
$value = $session->datetime->epochToSet($self->getOriginalValue,1);
} else {
# MySQL format
$value = $self->getOriginalValue;
# Fix time zone
$value = WebGUI::DateTime->new($session, mysql => $value)
->set_time_zone($self->get("timeZone"))
->strftime("%Y-%m-%d %H:%M:%S");
}
my $value = WebGUI::DateTime->new($session, $self->getOriginalValue)
->set_time_zone($self->get("timeZone"))
->strftime("%Y-%m-%d %H:%M:%S");
my $style = $session->style;
my $url = $session->url;
$style->setLink($url->extras('yui/build/calendar/assets/skins/sam/calendar.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
@ -245,12 +237,12 @@ sub toHtml {
$style->setScript($url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type => 'text/javascript' });
return WebGUI::Form::Text->new($self->session,
name=>$self->get("name"),
value=>$value,
size=>$self->get("size"),
extras=>$self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this, true);"',
id=>$self->get('id'),
maxlength=>$self->get("maxlength")
name => $self->get("name"),
value => $value,
size => $self->get("size"),
extras => $self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this, true);"',
id => $self->get('id'),
maxlength => $self->get("maxlength")
)->toHtml;
}
@ -263,28 +255,15 @@ Renders the form field to HTML as a hidden field rather than whatever field type
=cut
sub toHtmlAsHidden {
my $self = shift;
my $value;
my $self = shift;
my $value = WebGUI::DateTime->new($self->session, $self->getOriginalValue)
->set_time_zone($self->get("timeZone"))
->strftime("%Y-%m-%d %H:%M:%S");
# This should probably be rewritten as a cascading ternary
if (!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$self->get("value")
|| $self->get("value") =~ m/^\d+$/) {
$value = $self->session->datetime->epochToSet($self->getOriginalValue,1);
} else {
# MySQL format
$value = $self->getOriginalValue;
# Fix Time zone
$value = WebGUI::DateTime->new($self->session, mysql => $value)
->set_time_zone($self->get("timeZone"))
->strftime("%Y-%m-%d %H:%M:%S");
}
return WebGUI::Form::Hidden->new(
name => $self->get("name"),
value => $value,
)->toHtmlAsHidden;
return WebGUI::Form::Hidden->new($self->session,
name => $self->get("name"),
value => $value,
)->toHtmlAsHidden;
}
1;