From ff52a61e03782d9ecddbf5305517fed517b8f6da Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 19 Jul 2017 15:52:16 +0530
Subject: [PATCH] [minor] link filters should be selectable (#3736)

* [minor] link filters should be selectable

* [test] add timeout
---
 frappe/public/js/frappe/ui/base_list.js         | 2 +-
 frappe/public/js/frappe/ui/filters/filters.js   | 7 +++++--
 frappe/tests/ui/test_module/test_module_menu.js | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js
index 0d259edb4e..f320be9699 100644
--- a/frappe/public/js/frappe/ui/base_list.js
+++ b/frappe/public/js/frappe/ui/base_list.js
@@ -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'
 					}
diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
index 8aaee3031c..2b8fa41b0b 100644
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ b/frappe/public/js/frappe/ui/filters/filters.js
@@ -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;
diff --git a/frappe/tests/ui/test_module/test_module_menu.js b/frappe/tests/ui/test_module/test_module_menu.js
index 6b0960f3da..b73e30d8ba 100644
--- a/frappe/tests/ui/test_module/test_module_menu.js
+++ b/frappe/tests/ui/test_module/test_module_menu.js
@@ -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()
 	]);