Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 286-add-sorting-by-status-inside-groups-at-monitoring-page

This commit is contained in:
Vokhmin Alexey V 2013-08-29 18:49:43 +04:00
parent bfa07b577e 9cc58d5468
commit 0b1f8ab54f
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/build_list.rb
View File

@ -448,17 +448,13 @@ class BuildList < ActiveRecord::Base
def notify_users def notify_users
unless mass_build_id unless mass_build_id
users = [] users = [user, publisher].compact.uniq.select{ |u| u.notifier.can_notify? && u.notifier.new_build? }
if project # find associated users
users = project.all_members. # find associated users
select{ |user| user.notifier.can_notify? && user.notifier.new_associated_build? } users |= project.all_members.select do |u|
end u.notifier.can_notify? && u.notifier.new_associated_build?
if user.notifier.can_notify? && user.notifier.new_build? end if project
users = users | [user] users.each{ |u| UserMailer.build_list_notification(self, u).deliver }
end
users.each do |user|
UserMailer.build_list_notification(self, user).deliver
end
end end
end # notify_users end # notify_users

2
lib/modules/observers/activity_feed/build_list.rb
View File

@ -21,7 +21,7 @@ module Modules::Observers::ActivityFeed::BuildList
) )
updater = publisher || user updater = publisher || user
project.admins.each do |recipient| (project.admins | [publisher].compact).each do |recipient|
ActivityFeed.create( ActivityFeed.create(
:user => recipient, :user => recipient,
:kind => 'build_list_notification', :kind => 'build_list_notification',