Respect group members in mentionable concern

Dmitriy Zaporozhets
1 parent a8cb13c8
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/models/concerns/mentionable.rb
@@ -50,7 +50,7 @@ module Mentionable
     matches.each do |match|
       identifier = match.delete "@"
       if has_project
-        id = project.users_projects.joins(:user).where(users: { username: identifier }).pluck(:user_id).first
+        id = project.team.members.find { |u| u.username == identifier }.try(:id)
       else
         id = User.where(username: identifier).pluck(:id).first
       end
	@@ -50,7 +50,7 @@ module Mentionable		@@ -50,7 +50,7 @@ module Mentionable
50	matches.each do \|match\|	50	matches.each do \|match\|
51	identifier = match.delete "@"	51	identifier = match.delete "@"
52	if has_project	52	if has_project
53	- id = project.users_projects.joins(:user).where(users: { username: identifier }).pluck(:user_id).first	53	+ id = project.team.members.find { \|u\| u.username == identifier }.try(:id)
54	else	54	else
55	id = User.where(username: identifier).pluck(:id).first	55	id = User.where(username: identifier).pluck(:id).first
56	end	56	end