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

Events in the calendar, with and without starting times, behave similarly. Fixes bug #11033

Browse source
This commit is contained in:
Colin Kuskie 2009-09-24 16:00:54 -07:00
parent 768da4fc7e
commit 7d60f7523e
3 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -787,17 +787,17 @@ sub getEventsIn {
&&
!(
Event.startDate >= '$endDate'
|| Event.endDate < '$startDate'
|| Event.endDate <= '$startDate'
)
)
|| (
CONCAT(Event.startDate,' ',Event.startTime) >= '$start'
&& CONCAT(Event.startDate,' ',Event.startTime) < '$end'
|| !(
CONCAT(Event.startDate,' ',Event.startTime) >= '$end'
|| CONCAT(Event.endDate, ' ',Event.endTime ) <= '$start'
)
};
my @order_priority
= ( 'Event.startDate',
= ( 'Event.startDate',
'Event.startTime',
'Event.endDate',
'Event.endTime',