← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view into lp:ocb-web/6.1

 

Cedric Le Brouster(OpenFire) has proposed merging lp:~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view into lp:ocb-web/6.1.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1163912 in OpenERP Web: "[Trunk/7.0] Calendar month view does not show events starting in previous month"
  https://bugs.launchpad.net/openerp-web/+bug/1163912

For more details, see:
https://code.launchpad.net/~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view/+merge/215171

Fixes the bug 1163912 (Calendar views did not show events starting in previous month).
-- 
https://code.launchpad.net/~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view/+merge/215171
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~cedric-lebrouster/ocb-web/ocb-6.1-bug-1163912-calendar-view into lp:ocb-web/6.1.
=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-03-01 09:35:20 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2014-04-10 13:09:33 +0000
@@ -438,8 +438,10 @@
     get_range_domain: function() {
         var format = openerp.web.date_to_str,
             domain = this.last_search[0].slice(0);
-        domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
         domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
+        if (this.date_stop) {
+            domain.unshift([this.date_stop, '>=', format(this.range_start.clone().addDays(-6))]);
+        }
         return domain;
     },
     do_show: function () {


Follow ups