Przeglądaj źródła

Merge pull request #3965 from mbauskar/get-filter-condition

[hotfix] check if the operator is passed in filters for get-filter-conditions
version-14
Rushabh Mehta 8 lat temu
committed by GitHub
rodzic
commit
ca5ce399f0
2 zmienionych plików z 5 dodań i 1 usunięć
  1. +4
    -0
      frappe/desk/reportview.py
  2. +1
    -1
      frappe/public/js/frappe/form/multi_select_dialog.js

+ 4
- 0
frappe/desk/reportview.py Wyświetl plik

@@ -352,6 +352,10 @@ def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with
for f in filters: for f in filters:
if isinstance(f[1], basestring) and f[1][0] == '!': if isinstance(f[1], basestring) and f[1][0] == '!':
flt.append([doctype, f[0], '!=', f[1][1:]]) flt.append([doctype, f[0], '!=', f[1][1:]])
elif isinstance(f[1], list) and \
f[1][0] in (">", "<", ">=", "<=", "like", "not like", "in", "not in", "between"):

flt.append([doctype, f[0], f[1][0], f[1][1]])
else: else:
flt.append([doctype, f[0], '=', f[1]]) flt.append([doctype, f[0], '=', f[1]])




+ 1
- 1
frappe/public/js/frappe/form/multi_select_dialog.js Wyświetl plik

@@ -200,7 +200,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({


let date_val = this.dialog.fields_dict["date_range"].get_value(); let date_val = this.dialog.fields_dict["date_range"].get_value();
if(date_val) { if(date_val) {
filters[this.date_field] = ['Between', me.dialog.fields_dict["date_range"].parse(date_val)];
filters[this.date_field] = ['between', date_val];
} }


let args = { let args = {


Ładowanie…
Anuluj
Zapisz