Browse Source

[fix] DateRange filter when language is not en

version-14
Faris Ansari 8 years ago
parent
commit
df7fac641a
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      frappe/public/js/frappe/form/control.js

+ 6
- 2
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); this.set_mandatory && this.set_mandatory(value);
}, },
parse: function(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 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'); var to_date = moment(frappe.datetime.user_to_obj(vals[vals.length-1])).format('YYYY-MM-DD');
return [from_date, to_date]; return [from_date, to_date];


Loading…
Cancel
Save