vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] DateRange filter when language is not en

Browse source
This commit is contained in:
Faris Ansari 2017-08-18 16:20:41 +05:30
parent 6357633de0
commit df7fac641a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/form/control.js
View file

@ -953,8 +953,12 @@ frappe.ui.form.ControlDateRange = frappe.ui.form.ControlData.extend({
this.set_mandatory && this.set_mandatory(value);
},
parse: function(value) {
if(value && (value.indexOf(',') !== -1 || value.indexOf('to') !== -1)) {
var vals = value.split(/[( to )(,)]/);
const to = __(to);
var re = new RegExp(`[( ${to} )]`);
value = value.replace(re, ',');
if(value && value.includes(',')) {
var vals = value.split(',');
var from_date = moment(frappe.datetime.user_to_obj(vals[0])).format('YYYY-MM-DD');
var to_date = moment(frappe.datetime.user_to_obj(vals[vals.length-1])).format('YYYY-MM-DD');
return [from_date, to_date];