Commit 9cc2bdfcac9ec0b40ef7a282703ffced28c82316
Exists in
master
and in
1 other branch
Merge pull request #117 from aavenoso/master
Changes to fix notifications when app is set to notify all users
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/models/deploy.rb
| @@ -33,7 +33,7 @@ class Deploy | @@ -33,7 +33,7 @@ class Deploy | ||
| 33 | protected | 33 | protected |
| 34 | 34 | ||
| 35 | def should_notify? | 35 | def should_notify? |
| 36 | - app.notify_on_deploys? && app.watchers.any? | 36 | + app.notify_on_deploys? && app.notification_recipients.any? |
| 37 | end | 37 | end |
| 38 | 38 | ||
| 39 | def should_resolve_app_errs? | 39 | def should_resolve_app_errs? |
app/models/notice.rb
| @@ -98,7 +98,7 @@ class Notice | @@ -98,7 +98,7 @@ class Notice | ||
| 98 | protected | 98 | protected |
| 99 | 99 | ||
| 100 | def should_notify? | 100 | def should_notify? |
| 101 | - app.notify_on_errs? && (Errbit::Config.per_app_email_at_notices && app.email_at_notices || Errbit::Config.email_at_notices).include?(problem.notices_count) && app.watchers.any? | 101 | + app.notify_on_errs? && (Errbit::Config.per_app_email_at_notices && app.email_at_notices || Errbit::Config.email_at_notices).include?(problem.notices_count) && app.notification_recipients.any? |
| 102 | end | 102 | end |
| 103 | 103 | ||
| 104 | def increase_counter_cache | 104 | def increase_counter_cache |