← Back to branch summary

~openerp-dev/openerp-web/trunk-web_pdf_viewer-pga

« back to all changes in this revision

Viewing changes to addons/web_calendar/static/src/js/calendar.js

  • Committer: Parth Gajjar(Open ERP)
  • Date: 2013-09-16 11:25:36 UTC
  • mfrom: (3781.1.59 openerp-web)
  • Revision ID: pga@tinyerp.com-20130916112536-5b0zi1yf22wgsuij
merged with openerp-web

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web_calendar/static/src/js/calendar.js
399
399
        var A = format(this.range_start.clone().addDays(-6));
400
400
        var B = format(this.range_stop.clone().addDays(6));
401
401
        var domain = [
402
 
            '|', '|',
403
 
            '&', [this.date_start, '>=', A], [this.date_start, '<=', B],
 
402
            '&', [this.date_start, '>=', A], [this.date_start, '<=', B]
 
403
        ];
 
404
        if (this.date_stop) {
 
405
            domain.push(
404
406
            '&', [this.date_stop, '>=', A], [this.date_stop, '<=', B],
405
 
            '&', [this.date_start, '<', A], [this.date_stop, '>', B]
406
 
        ];
 
407
            '&', [this.date_start, '<', A], [this.date_stop, '>', B]);
 
408
            domain.unshift("|", "|");
 
409
        }
407
410
        domain.concat(this.last_search[0].slice(0))
408
411
        return domain;
409
412
    },