Merge lp:~cedric-lebrouster/openerp-web/6.1-bug-1163912-calendar-view into lp:openerp-web/6.1

Proposed by Cedric Le Brouster(OpenFire) on 2014-04-10
Status: Needs review
Proposed branch: lp:~cedric-lebrouster/openerp-web/6.1-bug-1163912-calendar-view
Merge into: lp:openerp-web/6.1
Diff against target: 15 lines (+3/-1)
1 file modified
addons/web_calendar/static/src/js/calendar.js (+3/-1)
To merge this branch: bzr merge lp:~cedric-lebrouster/openerp-web/6.1-bug-1163912-calendar-view
Reviewer Review Type Date Requested Status
OpenERP Core Team 2014-04-10 Pending
Review via email: mp+215170@code.launchpad.net

Description of the change

Fixes the bug 1163912 (Calendar views did not show events starting in previous month).

To post a comment you must log in.

Unmerged revisions

2525. By Cedric Le Brouster(OpenFire) on 2014-04-10

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_calendar/static/src/js/calendar.js'
2--- addons/web_calendar/static/src/js/calendar.js 2013-03-01 09:35:20 +0000
3+++ addons/web_calendar/static/src/js/calendar.js 2014-04-10 13:06:15 +0000
4@@ -438,8 +438,10 @@
5 get_range_domain: function() {
6 var format = openerp.web.date_to_str,
7 domain = this.last_search[0].slice(0);
8- domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
9 domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
10+ if (this.date_stop) {
11+ domain.unshift([this.date_stop, '>=', format(this.range_start.clone().addDays(-6))]);
12+ }
13 return domain;
14 },
15 do_show: function () {