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

Make sure that calendar time span flags are always set. Fixes bug #12271.

Browse source
This commit is contained in:
Colin Kuskie 2011-10-15 13:06:44 -07:00
parent 82603b29c7
commit 9da88844e0
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1133,7 +1133,7 @@ sub viewList {
);
### Build the event vars
my $dtLast = $dtStart; # The DateTime of the last event
my $dtLast = WebGUI::DateTime->new(0); # The DateTime of the last event
EVENT: for my $event (@events) {
next EVENT unless $event && $event->canView();
my ( %eventVar, %eventDate )
@ -1142,12 +1142,15 @@ sub viewList {
# Add the change flags
my $dt = $event->getDateTimeStart;
if ( $dt->year > $dtLast->year ) {
$eventVar{ new_year } = 1;
}
if ( $dt->month > $dtLast->month ) {
$eventVar{ new_year } = 1;
$eventVar{ new_month } = 1;
$eventVar{ new_day } = 1;
}
if ( $dt->day > $dtLast->day ) {
elsif ( $dt->month > $dtLast->month ) {
$eventVar{ new_month } = 1;
$eventVar{ new_day } = 1;
}
elsif ( $dt->day > $dtLast->day ) {
$eventVar{ new_day } = 1;
}

6
lib/WebGUI/Help/Asset_Calendar.pm
View file

@ -241,15 +241,15 @@ our $HELP = {
],
variables => [
{
name => 'newYear',
name => 'new_year',
description => 'helpvar newYear',
},
{
name => 'newMonth',
name => 'new_month',
description => 'helpvar newMonth',
},
{
name => 'newDay',
name => 'new_day',
description => 'helpvar newDay',
},
{