Add more tests for Calendar edge cases, and remove 1 day from the all day event window in getEventsIn. Fixes bug #11596.
This commit is contained in:
parent
dcf8b747b1
commit
951864f6d3
3 changed files with 52 additions and 10 deletions
|
|
@ -765,7 +765,7 @@ sub getEventsIn {
|
|||
&& Event.endTime IS NULL
|
||||
&&
|
||||
!(
|
||||
Event.startDate > '$endDate'
|
||||
Event.startDate > SUBDATE('$endDate', INTERVAL 1 DAY)
|
||||
|| Event.endDate < '$startDate'
|
||||
)
|
||||
)
|
||||
|
|
@ -790,7 +790,7 @@ sub getEventsIn {
|
|||
my $orderby = join ',', @order_priority;
|
||||
|
||||
my $events
|
||||
= $self->getLineage(["descendants"], {
|
||||
= $self->getLineage(["children"], {
|
||||
returnObjects => 1,
|
||||
includeOnlyClasses => ['WebGUI::Asset::Event'],
|
||||
joinClass => 'WebGUI::Asset::Event',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue