diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index adfa817e8c..62b9932355 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -36,7 +36,6 @@ frappe.ui.form.on("DocType", { if (doc.custom && frappe.session.user != "Administrator") { return { query: "frappe.core.doctype.role.role.role_query", - filters: [["Role", "name", "!=", "All"]], }; } }); diff --git a/frappe/core/doctype/role/role.py b/frappe/core/doctype/role/role.py index d4c4435769..3bf470493c 100644 --- a/frappe/core/doctype/role/role.py +++ b/frappe/core/doctype/role/role.py @@ -121,10 +121,14 @@ def get_users(role): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs def role_query(doctype, txt, searchfield, start, page_len, filters): - report_filters = [["Role", "name", "like", f"%{txt}%"], ["Role", "is_custom", "=", 0]] - if filters and isinstance(filters, list): - report_filters.extend(filters) - return frappe.get_all( - "Role", limit_start=start, limit_page_length=page_len, filters=report_filters, as_list=1 + "Role", + limit_start=start, + limit_page_length=page_len, + filters=[ + ["Role", "name", "like", f"%{txt}%"], + ["Role", "is_custom", "=", 0], + ["Role", "name", "!=", "All"], + ], + as_list=True, )