Bläddra i källkod

[minor] link filters should be selectable (#3736)

* [minor] link filters should be selectable

* [test] add timeout
version-14
Rushabh Mehta 8 år sedan
committed by Makarand Bauskar
förälder
incheckning
ff52a61e03
3 ändrade filer med 7 tillägg och 3 borttagningar
  1. +1
    -1
      frappe/public/js/frappe/ui/base_list.js
  2. +5
    -2
      frappe/public/js/frappe/ui/filters/filters.js
  3. +1
    -0
      frappe/tests/ui/test_module/test_module_menu.js

+ 1
- 1
frappe/public/js/frappe/ui/base_list.js Visa fil

@@ -198,7 +198,7 @@ frappe.ui.BaseList = Class.extend({
let options = df.options;
let condition = '=';
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',
condition = 'like'
}


+ 5
- 2
frappe/public/js/frappe/ui/filters/filters.js Visa fil

@@ -59,8 +59,11 @@ frappe.ui.FilterList = Class.extend({
},

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
this.base_list.page.fields_dict[fieldname].set_input(value);
return;


+ 1
- 0
frappe/tests/ui/test_module/test_module_menu.js Visa fil

@@ -19,6 +19,7 @@ QUnit.test("Test sidebar menu [Module view]", function(assert) {
module_name = $(sidebar_opt)[random_num].innerText;
},
() => 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"),
() => done()
]);


Laddar…
Avbryt
Spara