Skip to content

Commit

Permalink
fix: show full item name in search widget (#28283) (#28285)
Browse files Browse the repository at this point in the history
(cherry picked from commit 34f5283)

Co-authored-by: Ankush Menat <ankush@frappe.io>
  • Loading branch information
mergify[bot] and ankush authored Nov 9, 2021
1 parent 40b5bb1 commit eacf26d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions erpnext/controllers/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,15 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
meta = frappe.get_meta("Item", cached=True)
searchfields = meta.get_search_fields()

if "description" in searchfields:
searchfields.remove("description")
# these are handled separately
ignored_search_fields = ("item_name", "description")
for ignored_field in ignored_search_fields:
if ignored_field in searchfields:
searchfields.remove(ignored_field)

columns = ''
extra_searchfields = [field for field in searchfields
if not field in ["name", "item_group", "description"]]
if not field in ["name", "item_group", "description", "item_name"]]

if extra_searchfields:
columns = ", " + ", ".join(extra_searchfields)
Expand Down Expand Up @@ -253,10 +256,8 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
if frappe.db.count('Item', cache=True) < 50000:
# scan description only if items are less than 50000
description_cond = 'or tabItem.description LIKE %(txt)s'
return frappe.db.sql("""select tabItem.name,
if(length(tabItem.item_name) > 40,
concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
tabItem.item_group,
return frappe.db.sql("""select
tabItem.name, tabItem.item_name, tabItem.item_group,
if(length(tabItem.description) > 40, \
concat(substr(tabItem.description, 1, 40), "..."), description) as description
{columns}
Expand Down

0 comments on commit eacf26d

Please sign in to comment.