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

Improvements to group mentions (#8927)

Browse Source 
* FIX: Avoid highlight mention to groups that are not public
* UX: Composer autocomplete will suggest all visible group names
This commit is contained in:
Dan Ungureanu
2020-02-12 10:11:10 +02:00
committed by GitHub
parent fc3d547268
commit 3f50481188
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/users_controller.rb
View File

@ -308,7 +308,7 @@ class UsersController < ApplicationController
groups = Group.where(name: usernames).pluck(:name)
mentionable_groups =
if current_user
Group.mentionable(current_user)
Group.mentionable
.where(name: usernames)
.pluck(:name, :user_count)
.map do |name, user_count|
@ -901,22 +901,21 @@ class UsersController < ApplicationController
groups =
if current_user
if params[:include_mentionable_groups] == 'true'
if params[:include_groups] == 'true'
Group.visible_groups(current_user)
elsif params[:include_mentionable_groups] == 'true'
Group.mentionable(current_user)
elsif params[:include_messageable_groups] == 'true'
Group.messageable(current_user)
end
end
include_groups = params[:include_groups] == "true"
# blank term is only handy for in-topic search of users after @
# we do not want group results ever if term is blank
include_groups = groups = nil if term.blank?
groups = nil if term.blank?
if include_groups || groups
if groups
groups = Group.search_groups(term, groups: groups)
groups = groups.where(visibility_level: Group.visibility_levels[:public]) if include_groups
groups = groups.order('groups.name asc')
to_render[:groups] = groups.map do |m|