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

fix events always getting start/end times

Browse source
This commit is contained in:
Graham Knop 2007-08-24 07:46:13 +00:00
parent cd3cd63d12
commit 93d55ea3fc
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Asset/Event.pm
View file

@ -77,11 +77,13 @@ sub definition {
},
'startTime' => {
fieldType => "TimeField",
defaultValue => $dt->toMysqlTime,
defaultValue => undef,
format => 'mysql',
},
'endTime' => {
fieldType => "TimeField",
defaultValue => $dt->toMysqlTime,
defaultValue => undef,
format => 'mysql',
},
'recurId' => {
@ -1425,9 +1427,9 @@ sub processPropertiesFromFormPost {
# Fix times according to input (allday, timezone)
# All day events have no time
if ($form->param("allday")) {
$self->update({
startTime => undef,
endTime => undef,
$self->update({
startTime => '',
endTime => '',
});
}
# Non-allday events need timezone conversion
@ -1660,7 +1662,7 @@ Wrap update so that isHidden is always set to be a 1.
sub update {
my $self = shift;
my $properties = shift;
my $properties = shift;
$properties->{isHidden} = 1;
return $self->SUPER::update($properties);
}

10
lib/WebGUI/Form/TimeField.pm
View file

@ -87,7 +87,10 @@ sub definition {
size=>{
defaultValue=>8
},
profileEnabled=>{
format => {
defaultValue => undef,
}.
profileEnabled=>{
defaultValue=>1
},
dbDataType => {
@ -118,10 +121,11 @@ sub getValueFromPost {
if (@_) {
my $value = shift;
if (!$self->get("defaultValue")
if ($self->get('format') ne 'mysql' && (
!$self->get("defaultValue")
|| $self->get("defaultValue") =~ m/^\d+$/
|| !$value
|| $value =~ m/^\d+$/) {
|| $value =~ m/^\d+$/)) {
return $self->session->datetime->timeToSeconds($value)-($self->session->user->profileField("timeOffset")*3600);
}
elsif ($value =~ /^\d{2}\D\d{2}(\D\d{2})?$/) {