Merge pull request #2801 from consul/proposal_authors_notifications

Prevent authors from receiving their own proposals notification emails
2018-07-26 14:12:14 +02:00
parent 89f2f53e75 1aa8737ed5
commit b04b1bee46
3 changed files with 14 additions and 3 deletions
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -205,7 +205,7 @@ class Proposal < ActiveRecord::Base
  end

  def users_to_notify
-    (voters + followers).uniq
+    (voters + followers).uniq - [author]
  end

  def self.proposals_orders(user)
--- a/app/views/admin/activity/show.html.erb
+++ b/app/views/admin/activity/show.html.erb
@@ -35,8 +35,6 @@
              <%= activity.actionable.body %>
            <% when "Newsletter" %>
              <strong><%= activity.actionable.subject %></strong>
-              <br>
-              <%= activity.actionable.body %>
            <% when "ProposalNotification" %>
              <strong><%= activity.actionable.title %></strong>
              <br>