From 73fecedc4be0364add81669c85ebc82e47ff4b3f Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Fri, 19 Jul 2013 11:25:15 +0200 Subject: [PATCH] [FIX] web_calendar: do not generate invalid domain if views does not specify a "date_stop" field lp bug: https://launchpad.net/bugs/1197323 fixed bzr revid: chs@openerp.com-20130719092515-7yrvp0ifooa6rxae --- addons/web_calendar/static/src/js/calendar.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 9d6ce68a553..a0945836fd6 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -399,11 +399,14 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ var A = format(this.range_start.clone().addDays(-6)); var B = 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] + '&', [this.date_start, '>=', A], [this.date_start, '<=', B] ]; + if (this.date_stop) { + domain.push( + '&', [this.date_stop, '>=', A], [this.date_stop, '<=', B], + '&', [this.date_start, '<', A], [this.date_stop, '>', B]); + domain.unshift("|", "|"); + } domain.concat(this.last_search[0].slice(0)) return domain; },