github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 11:11:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Minor hashtag autocomplete fixes (#19173)

Browse Source 
* Do not search category name when searching channels to avoid
  confusing results
* Overflow text in autocomplete menu with ... if it is too long
* Make autocomplete menu less height
This commit is contained in:
Martin Brennan
2022-11-24 14:45:13 +10:00
committed by GitHub
parent 65f57a4d05
commit a34838d671
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/chat/lib/chat_channel_fetcher.rb
View File

@ -99,8 +99,15 @@ module Chat::ChatChannelFetcher
channels = channels.where(status: options[:status]) if options[:status].present?
if options[:filter].present?
category_filter = \
if options[:filter_on_category_name]
"OR categories.name ILIKE :filter"
else
""
end
sql =
"chat_channels.name ILIKE :filter OR chat_channels.slug ILIKE :filter OR categories.name ILIKE :filter"
"chat_channels.name ILIKE :filter OR chat_channels.slug ILIKE :filter #{category_filter}"
channels =
channels.where(sql, filter: "%#{options[:filter].downcase}%").order(
"chat_channels.name ASC, categories.name ASC",
@ -142,7 +149,7 @@ module Chat::ChatChannelFetcher
channels =
secured_public_channel_search(
guardian,
options.merge(include_archives: true),
options.merge(include_archives: true, filter_on_category_name: true),
)
decorate_memberships_with_tracking_data(guardian, channels, memberships)
channels = channels.to_a