From e754a22f9b193514a50c6486db81f502a9a8b72a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 6 Apr 2017 15:56:08 +0530 Subject: [PATCH] [minor] fix filters --- frappe/public/js/frappe/ui/filters/filters.js | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js index 0512ffb94b..acb87efb8e 100644 --- a/frappe/public/js/frappe/ui/filters/filters.js +++ b/frappe/public/js/frappe/ui/filters/filters.js @@ -256,24 +256,6 @@ frappe.ui.FilterList = Class.extend({ var date_wrapper = $('
').appendTo($(this)); make_date("range"); - var check = frappe.ui.form.make_control({ - parent: this, - df: { - fieldtype: "Check", - fieldname: "is_date_range", - label: __("Date Range") - } - }); - check.change = function() { - date.datepicker.clear(); - date && date.wrapper.remove(); - check.get_value() ? - make_date("range"): - make_date("single"); - } - check.refresh(); - check.set_input(1); - function make_date(mode) { var fieldtype = mode==="range" ? "DateRange" : "Date"; var name = $(v).data("name"); @@ -298,8 +280,12 @@ frappe.ui.FilterList = Class.extend({ me.add_filter(me.doctype, name, '=', moment(dateObj).format('YYYY-MM-DD')); me.base_list.run(); } else if(dateObj.length===2 && date.datepicker.opts.range===true) { - me.add_filter(me.doctype, name, 'Between', - [moment(dateObj[0]).format('YYYY-MM-DD'), moment(dateObj[1]).format('YYYY-MM-DD')]); + var [date1, date2] = [moment(dateObj[0]).format('YYYY-MM-DD'), moment(dateObj[1]).format('YYYY-MM-DD')]; + if(date1==date2) { + me.add_filter(me.doctype, name, '=', date1); + } else { + me.add_filter(me.doctype, name, 'Between', [date1, date2]); + } me.base_list.run(); } });