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

[FIX] Calendar month view does not show events starting in previous month. bug-1163912 

bzr revid: chm@openerp.com-20130628090706-ztqfodf5xxi2201j
This commit is contained in:
Christophe Matthieu 2013-06-28 11:07:06 +02:00
parent 3d6b52821d
commit be4ba6f7b1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,10 +395,16 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
}); });
}, },
get_range_domain: function() { get_range_domain: function() {
var format = instance.web.date_to_str, var format = instance.web.date_to_str;
domain = this.last_search[0].slice(0); var A = format(this.range_start.clone().addDays(-6));
domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]); var B = format(this.range_stop.clone().addDays(6));
domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]); var domain = [
'|', '|',
'&', [this.date_start, '>=', A], [this.date_start, '<=', B],
'&', [this.date_stop, '>=', A], [this.date_stop, '<=', B],
'&', [this.date_start, '<', A], [this.date_stop, '>', B]
];
domain.concat(this.last_search[0].slice(0))
return domain; return domain;
}, },
do_show: function () { do_show: function () {