From: Tom Hughes Date: Fri, 30 Oct 2015 19:01:09 +0000 (+0000) Subject: Don't send changeset comment notifications to deleted users X-Git-Tag: live~3956 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a082baebd7d6ad5155f30d7804f96edd41a9d429 Don't send changeset comment notifications to deleted users --- diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 5b55980e3..9ac82d092 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -327,7 +327,7 @@ class ChangesetController < ApplicationController :author => @user) # Notify current subscribers of the new comment - changeset.subscribers.each do |user| + changeset.subscribers.visible.each do |user| if @user != user Notifier.changeset_comment_notification(comment, user).deliver_now end diff --git a/test/fixtures/changesets_subscribers.yml b/test/fixtures/changesets_subscribers.yml index d8bd5be96..c75287832 100644 --- a/test/fixtures/changesets_subscribers.yml +++ b/test/fixtures/changesets_subscribers.yml @@ -5,3 +5,11 @@ t1: t2: changeset_id: 8 subscriber_id: 1 + +t3: + changeset_id: 8 + subscriber_id: 10 + +t4: + changeset_id: 8 + subscriber_id: 11