github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Avoid highlight mention to groups that are not public.

Browse Source 
Follow-up to 3f5048118802116679ef28c32728f697cbfb8404.
This commit is contained in:
Dan Ungureanu
2020-02-12 12:34:09 +02:00
parent ec40242b5c
commit 67c9940d72
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/link-mentions.js.es6
View File

@ -46,7 +46,7 @@ function updateFound($mentions, usernames) {
const username = usernames[i]; const username = usernames[i];
if (found[username.toLowerCase()]) { if (found[username.toLowerCase()]) {
replaceSpan($e, username, { cannot_see: cannotSee[username] }); replaceSpan($e, username, { cannot_see: cannotSee[username] });
} else if (foundGroups[username]) { } else if (mentionableGroups[username]) {
replaceSpan($e, username, { replaceSpan($e, username, {
group: true, group: true,
mentionable: mentionableGroups[username] mentionable: mentionableGroups[username]

2
app/controllers/users_controller.rb
View File

@ -308,7 +308,7 @@ class UsersController < ApplicationController
groups = Group.where(name: usernames).pluck(:name) groups = Group.where(name: usernames).pluck(:name)
mentionable_groups = mentionable_groups =
if current_user if current_user
Group.mentionable Group.mentionable(current_user)
.where(name: usernames) .where(name: usernames)
.pluck(:name, :user_count) .pluck(:name, :user_count)
.map do |name, user_count| .map do |name, user_count|