* [minor] link filters should be selectable * [test] add timeoutversion-14
@@ -198,7 +198,7 @@ frappe.ui.BaseList = Class.extend({ | |||||
let options = df.options; | let options = df.options; | ||||
let condition = '='; | let condition = '='; | ||||
let fieldtype = df.fieldtype; | let fieldtype = df.fieldtype; | ||||
if (['Link', 'Text', 'Small Text', 'Text Editor', 'Data'].includes(fieldtype)) { | |||||
if (['Text', 'Small Text', 'Text Editor', 'Data'].includes(fieldtype)) { | |||||
fieldtype = 'Data', | fieldtype = 'Data', | ||||
condition = 'like' | condition = 'like' | ||||
} | } | ||||
@@ -59,8 +59,11 @@ frappe.ui.FilterList = Class.extend({ | |||||
}, | }, | ||||
add_filter: function(doctype, fieldname, condition, value, hidden) { | add_filter: function(doctype, fieldname, condition, value, hidden) { | ||||
if (this.base_list.page.fields_dict[fieldname] | |||||
&& ['=', 'like'].includes(condition)) { | |||||
// allow equal to be used as like | |||||
let base_filter = this.base_list.page.fields_dict[fieldname]; | |||||
if (base_filter | |||||
&& (base_filter.df.condition==condition | |||||
|| (condition==='=' && base_filter.df.condition==='like'))) { | |||||
// if filter exists in base_list, then exit | // if filter exists in base_list, then exit | ||||
this.base_list.page.fields_dict[fieldname].set_input(value); | this.base_list.page.fields_dict[fieldname].set_input(value); | ||||
return; | return; | ||||
@@ -19,6 +19,7 @@ QUnit.test("Test sidebar menu [Module view]", function(assert) { | |||||
module_name = $(sidebar_opt)[random_num].innerText; | module_name = $(sidebar_opt)[random_num].innerText; | ||||
}, | }, | ||||
() => frappe.tests.click_and_wait(sidebar_opt, random_num), | () => frappe.tests.click_and_wait(sidebar_opt, random_num), | ||||
() => frappe.timeout(2), | |||||
() => assert.equal($('.title-text:visible')[0].innerText, module_name, "Module opened successfully using sidebar"), | () => assert.equal($('.title-text:visible')[0].innerText, module_name, "Module opened successfully using sidebar"), | ||||
() => done() | () => done() | ||||
]); | ]); | ||||