kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix notifications for group projects

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-06-21 23:36:02 +03:00
parent 3208dad1e7
commit 4c9e47f6e0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/services/notification_service.rb
View file

@ -147,17 +147,17 @@ class NotificationService
# Get project users with WATCH notification level # Get project users with WATCH notification level
def project_watchers(project) def project_watchers(project)
project_watchers = []
member_methods = { project => :users_projects }
member_methods.merge!(project.group => :users_groups) if project.group
member_methods = [:users_projects] member_methods.each do |object, member_method|
member_methods << :users_groups if project.group
member_methods.each do |member_method|
# Get project notification settings since it has higher priority # Get project notification settings since it has higher priority
user_ids = project.send(member_method).where(notification_level: Notification::N_WATCH).pluck(:user_id) user_ids = object.send(member_method).where(notification_level: Notification::N_WATCH).pluck(:user_id)
project_watchers = User.where(id: user_ids) project_watchers += User.where(id: user_ids)
# next collect users who use global settings with watch state # next collect users who use global settings with watch state
user_ids = project.send(member_method).where(notification_level: Notification::N_GLOBAL).pluck(:user_id) user_ids = object.send(member_method).where(notification_level: Notification::N_GLOBAL).pluck(:user_id)
project_watchers += User.where(id: user_ids, notification_level: Notification::N_WATCH) project_watchers += User.where(id: user_ids, notification_level: Notification::N_WATCH)
end end
@ -175,7 +175,7 @@ class NotificationService
tm = project.users_projects.find_by_user_id(user.id) tm = project.users_projects.find_by_user_id(user.id)
if !tm && project.group if !tm && project.group
tm = project.users_groups.find_by_user_id(user.id) tm = project.group.users_groups.find_by_user_id(user.id)
end end
# reject users who globally disabled notification and has no membership # reject users who globally disabled notification and has no membership