odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] web_calendar: fixed counting of days when selection spans multiple weeks 

As event_obj._length doesn't return the number of days when the selection spans
multiple weeks, the test was wrong when the selection ended on the first day of
a subsequent week.

This fix was originaly written by rha-odoo at 95d344b, but I rewrote it a little.
I would have liked a cleaner way of finding how many days there were between the
two dates, but I couldn't find anything better, considering I didn't want to
create new objects just for that test.
Fixes opw 614703.
This commit is contained in:
David Monjoie 2015-04-20 14:10:10 +02:00
parent 0b2bc27adc
commit f4e1974d67
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/web_calendar/static/src/js/calendar.js
View File

@ -482,7 +482,8 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
this.is_slow_open = true;
if (this.current_mode() === 'month') {
event_obj['start_date'].addHours(8);
if (event_obj._length === 1) {
var timediff = Math.abs(event_obj['end_date'] - event_obj['start_date']);
if (timediff <= 24*60*60*1000) { // If it spans one day or less
event_obj['end_date'] = new Date(event_obj['start_date']);
event_obj['end_date'].addHours(1);
} else {